2003-02-15 18:22:40 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
|
|
|
/* activation.c Activation of services
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2003 CodeFactory AB
|
2003-04-02 20:14:52 +00:00
|
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
2004-03-12 14:07:16 +00:00
|
|
|
* Copyright (C) 2004 Imendio HB
|
2003-02-15 18:22:40 +00:00
|
|
|
*
|
2003-12-02 10:44:22 +00:00
|
|
|
* Licensed under the Academic Free License version 2.0
|
2003-02-15 18:22:40 +00:00
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
#include "activation.h"
|
|
|
|
|
#include "desktop-file.h"
|
2003-03-16 22:25:18 +00:00
|
|
|
#include "services.h"
|
2004-03-12 14:07:16 +00:00
|
|
|
#include "test.h"
|
2003-02-15 18:22:40 +00:00
|
|
|
#include "utils.h"
|
|
|
|
|
#include <dbus/dbus-internals.h>
|
|
|
|
|
#include <dbus/dbus-hash.h>
|
2003-03-16 22:25:18 +00:00
|
|
|
#include <dbus/dbus-list.h>
|
2003-04-05 10:04:04 +00:00
|
|
|
#include <dbus/dbus-spawn.h>
|
2003-04-05 19:03:40 +00:00
|
|
|
#include <dbus/dbus-timeout.h>
|
2003-02-15 18:22:40 +00:00
|
|
|
#include <dirent.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
|
|
#define DBUS_SERVICE_SECTION "D-BUS Service"
|
|
|
|
|
#define DBUS_SERVICE_NAME "Name"
|
|
|
|
|
#define DBUS_SERVICE_EXEC "Exec"
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
struct BusActivation
|
|
|
|
|
{
|
|
|
|
|
int refcount;
|
|
|
|
|
DBusHashTable *entries;
|
2003-03-16 22:25:18 +00:00
|
|
|
DBusHashTable *pending_activations;
|
2004-03-12 14:07:16 +00:00
|
|
|
char *server_address;
|
2003-03-16 22:25:18 +00:00
|
|
|
BusContext *context;
|
2003-04-25 23:50:34 +00:00
|
|
|
int n_pending_activations; /**< This is in fact the number of BusPendingActivationEntry,
|
|
|
|
|
* i.e. number of pending activation requests, not pending
|
|
|
|
|
* activations per se
|
2004-03-12 14:07:16 +00:00
|
|
|
*/
|
|
|
|
|
DBusHashTable *directories;
|
2003-03-13 03:52:58 +00:00
|
|
|
};
|
2003-02-15 18:22:40 +00:00
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
int refcount;
|
|
|
|
|
char *dir_c;
|
|
|
|
|
DBusHashTable *entries;
|
|
|
|
|
} BusServiceDirectory;
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
int refcount;
|
2003-02-15 18:22:40 +00:00
|
|
|
char *name;
|
|
|
|
|
char *exec;
|
2004-03-12 14:07:16 +00:00
|
|
|
unsigned long mtime;
|
|
|
|
|
BusServiceDirectory *s_dir;
|
|
|
|
|
char *filename;
|
2003-02-15 18:22:40 +00:00
|
|
|
} BusActivationEntry;
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
typedef struct BusPendingActivationEntry BusPendingActivationEntry;
|
|
|
|
|
|
|
|
|
|
struct BusPendingActivationEntry
|
|
|
|
|
{
|
|
|
|
|
DBusMessage *activation_message;
|
|
|
|
|
DBusConnection *connection;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
2003-04-11 00:03:06 +00:00
|
|
|
int refcount;
|
2003-04-05 19:03:40 +00:00
|
|
|
BusActivation *activation;
|
2003-03-16 22:25:18 +00:00
|
|
|
char *service_name;
|
|
|
|
|
DBusList *entries;
|
2003-04-25 23:50:34 +00:00
|
|
|
int n_entries;
|
2003-04-05 19:03:40 +00:00
|
|
|
DBusBabysitter *babysitter;
|
|
|
|
|
DBusTimeout *timeout;
|
|
|
|
|
unsigned int timeout_added : 1;
|
2003-03-16 22:25:18 +00:00
|
|
|
} BusPendingActivation;
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
static BusServiceDirectory *
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (dir->refcount > 0);
|
|
|
|
|
dir->refcount--;
|
|
|
|
|
|
|
|
|
|
if (dir->refcount > 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (dir->entries)
|
|
|
|
|
_dbus_hash_table_unref (dir->entries);
|
|
|
|
|
|
|
|
|
|
dbus_free (dir->dir_c);
|
|
|
|
|
dbus_free (dir);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
static void
|
|
|
|
|
bus_pending_activation_entry_free (BusPendingActivationEntry *entry)
|
|
|
|
|
{
|
|
|
|
|
if (entry->activation_message)
|
|
|
|
|
dbus_message_unref (entry->activation_message);
|
|
|
|
|
|
|
|
|
|
if (entry->connection)
|
|
|
|
|
dbus_connection_unref (entry->connection);
|
2003-04-05 19:03:40 +00:00
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
dbus_free (entry);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2003-04-05 19:03:40 +00:00
|
|
|
handle_timeout_callback (DBusTimeout *timeout,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation = data;
|
|
|
|
|
|
|
|
|
|
while (!dbus_timeout_handle (pending_activation->timeout))
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_wait_for_memory ();
|
2003-04-05 19:03:40 +00:00
|
|
|
}
|
|
|
|
|
|
2003-11-27 01:25:50 +00:00
|
|
|
static BusPendingActivation *
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_ref (BusPendingActivation *pending_activation)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (pending_activation->refcount > 0);
|
|
|
|
|
pending_activation->refcount += 1;
|
2003-11-27 01:25:50 +00:00
|
|
|
|
|
|
|
|
return pending_activation;
|
2003-04-11 00:03:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
bus_pending_activation_unref (BusPendingActivation *pending_activation)
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
|
|
|
|
DBusList *link;
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
if (pending_activation == NULL) /* hash table requires this */
|
2003-03-16 22:25:18 +00:00
|
|
|
return;
|
|
|
|
|
|
2003-04-11 00:03:06 +00:00
|
|
|
_dbus_assert (pending_activation->refcount > 0);
|
|
|
|
|
pending_activation->refcount -= 1;
|
|
|
|
|
|
|
|
|
|
if (pending_activation->refcount > 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
if (pending_activation->timeout_added)
|
|
|
|
|
{
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_loop_remove_timeout (bus_context_get_loop (pending_activation->activation->context),
|
|
|
|
|
pending_activation->timeout,
|
|
|
|
|
handle_timeout_callback, pending_activation);
|
2003-04-05 19:03:40 +00:00
|
|
|
pending_activation->timeout_added = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pending_activation->timeout)
|
|
|
|
|
_dbus_timeout_unref (pending_activation->timeout);
|
|
|
|
|
|
|
|
|
|
if (pending_activation->babysitter)
|
|
|
|
|
{
|
|
|
|
|
if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter,
|
|
|
|
|
NULL, NULL, NULL,
|
|
|
|
|
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);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
link = _dbus_list_get_first_link (&pending_activation->entries);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivationEntry *entry = link->data;
|
|
|
|
|
|
|
|
|
|
bus_pending_activation_entry_free (entry);
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
link = _dbus_list_get_next_link (&pending_activation->entries, link);
|
2003-03-16 22:25:18 +00:00
|
|
|
}
|
2003-04-05 19:03:40 +00:00
|
|
|
_dbus_list_clear (&pending_activation->entries);
|
2003-04-25 23:50:34 +00:00
|
|
|
|
|
|
|
|
pending_activation->activation->n_pending_activations -=
|
|
|
|
|
pending_activation->n_entries;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (pending_activation->activation->n_pending_activations >= 0);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
dbus_free (pending_activation);
|
2003-03-16 22:25:18 +00:00
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
static BusActivationEntry *
|
|
|
|
|
bus_activation_entry_ref (BusActivationEntry *entry)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (entry->refcount > 0);
|
|
|
|
|
entry->refcount++;
|
|
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-15 18:22:40 +00:00
|
|
|
static void
|
2004-03-12 14:07:16 +00:00
|
|
|
bus_activation_entry_unref (BusActivationEntry *entry)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
if (entry == NULL) /* hash table requires this */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (entry->refcount > 0);
|
|
|
|
|
entry->refcount--;
|
|
|
|
|
|
|
|
|
|
if (entry->refcount > 0)
|
2003-02-15 18:22:40 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
dbus_free (entry->name);
|
|
|
|
|
dbus_free (entry->exec);
|
2004-03-12 14:07:16 +00:00
|
|
|
dbus_free (entry->filename);
|
2003-04-03 21:56:22 +00:00
|
|
|
|
|
|
|
|
dbus_free (entry);
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
2004-03-12 14:07:16 +00:00
|
|
|
update_desktop_file_entry (BusActivation *activation,
|
|
|
|
|
BusServiceDirectory *s_dir,
|
|
|
|
|
DBusString *filename,
|
|
|
|
|
BusDesktopFile *desktop_file,
|
|
|
|
|
DBusError *error)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
|
|
|
|
char *name, *exec;
|
|
|
|
|
BusActivationEntry *entry;
|
2004-03-12 14:07:16 +00:00
|
|
|
DBusStat stat_buf;
|
|
|
|
|
DBusString file_path;
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2003-03-26 03:58:11 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
name = NULL;
|
|
|
|
|
exec = NULL;
|
|
|
|
|
entry = NULL;
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
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))
|
|
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"Can't stat the service file\n");
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-15 18:22:40 +00:00
|
|
|
if (!bus_desktop_file_get_string (desktop_file,
|
|
|
|
|
DBUS_SERVICE_SECTION,
|
|
|
|
|
DBUS_SERVICE_NAME,
|
|
|
|
|
&name))
|
|
|
|
|
{
|
2003-03-13 00:56:43 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"No \""DBUS_SERVICE_NAME"\" key in .service file\n");
|
|
|
|
|
goto failed;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bus_desktop_file_get_string (desktop_file,
|
|
|
|
|
DBUS_SERVICE_SECTION,
|
|
|
|
|
DBUS_SERVICE_EXEC,
|
|
|
|
|
&exec))
|
|
|
|
|
{
|
2003-03-13 00:56:43 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"No \""DBUS_SERVICE_EXEC"\" key in .service file\n");
|
|
|
|
|
goto failed;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
entry = _dbus_hash_table_lookup_string (s_dir->entries,
|
|
|
|
|
_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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entry = dbus_new0 (BusActivationEntry, 1);
|
|
|
|
|
if (entry == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entry->name = name;
|
|
|
|
|
entry->exec = exec;
|
|
|
|
|
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 (activation->entries, entry->name, bus_activation_entry_ref (entry)))
|
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_dbus_verbose ("Added \"%s\" to list of services\n", entry->name);
|
|
|
|
|
}
|
|
|
|
|
else /* Just update the entry */
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
bus_activation_entry_ref (entry);
|
|
|
|
|
_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_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;
|
|
|
|
|
}
|
2003-03-13 00:56:43 +00:00
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
entry->mtime = stat_buf.mtime;
|
|
|
|
|
|
|
|
|
|
_dbus_string_free (&file_path);
|
|
|
|
|
bus_activation_entry_unref (entry);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
dbus_free (name);
|
|
|
|
|
dbus_free (exec);
|
|
|
|
|
_dbus_string_free (&file_path);
|
|
|
|
|
|
|
|
|
|
if (entry)
|
|
|
|
|
bus_activation_entry_unref (entry);
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
check_service_file (BusActivation *activation,
|
|
|
|
|
BusActivationEntry *entry,
|
|
|
|
|
BusActivationEntry **updated_entry,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
|
|
|
|
DBusStat stat_buf;
|
|
|
|
|
dbus_bool_t retval;
|
|
|
|
|
BusActivationEntry *tmp_entry;
|
|
|
|
|
DBusString file_path;
|
|
|
|
|
DBusString filename;
|
|
|
|
|
|
|
|
|
|
retval = TRUE;
|
|
|
|
|
tmp_entry = entry;
|
|
|
|
|
|
|
|
|
|
_dbus_string_init_const (&filename, entry->filename);
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&file_path))
|
2003-03-13 00:56:43 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
2004-03-12 14:07:16 +00:00
|
|
|
return FALSE;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
2004-03-12 14:07:16 +00:00
|
|
|
|
|
|
|
|
if (!_dbus_string_append (&file_path, entry->s_dir->dir_c) ||
|
|
|
|
|
!_dbus_concat_dir_and_file (&file_path, &filename))
|
2003-03-13 00:56:43 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
2004-03-12 14:07:16 +00:00
|
|
|
retval = FALSE;
|
|
|
|
|
goto out;
|
2003-03-13 00:56:43 +00:00
|
|
|
}
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
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));
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
_dbus_hash_table_remove_string (activation->entries, entry->name);
|
|
|
|
|
_dbus_hash_table_remove_string (entry->s_dir->entries, entry->filename);
|
|
|
|
|
|
|
|
|
|
tmp_entry = NULL;
|
|
|
|
|
retval = TRUE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
out:
|
|
|
|
|
_dbus_string_free (&file_path);
|
|
|
|
|
|
|
|
|
|
if (updated_entry != NULL)
|
|
|
|
|
*updated_entry = tmp_entry;
|
|
|
|
|
return retval;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
/* warning: this doesn't fully "undo" itself on failure, i.e. doesn't strip
|
|
|
|
|
* hash entries it already added.
|
|
|
|
|
*/
|
|
|
|
|
static dbus_bool_t
|
2004-03-12 14:07:16 +00:00
|
|
|
update_directory (BusActivation *activation,
|
|
|
|
|
BusServiceDirectory *s_dir,
|
|
|
|
|
DBusError *error)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
|
|
|
|
DBusDirIter *iter;
|
|
|
|
|
DBusString dir, filename;
|
2003-03-13 00:56:43 +00:00
|
|
|
BusDesktopFile *desktop_file;
|
|
|
|
|
DBusError tmp_error;
|
2003-04-03 21:56:22 +00:00
|
|
|
dbus_bool_t retval;
|
2004-03-12 14:07:16 +00:00
|
|
|
BusActivationEntry *entry;
|
|
|
|
|
DBusString full_path;
|
2003-04-03 21:56:22 +00:00
|
|
|
|
2003-03-26 03:58:11 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
2003-03-13 00:56:43 +00:00
|
|
|
|
|
|
|
|
iter = NULL;
|
|
|
|
|
desktop_file = NULL;
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
_dbus_string_init_const (&dir, s_dir->dir_c);
|
|
|
|
|
|
2003-03-31 20:56:29 +00:00
|
|
|
if (!_dbus_string_init (&filename))
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2003-03-13 00:56:43 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
2003-03-31 20:56:29 +00:00
|
|
|
if (!_dbus_string_init (&full_path))
|
2003-03-13 00:56:43 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
_dbus_string_free (&filename);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-03 21:56:22 +00:00
|
|
|
retval = FALSE;
|
2004-03-12 14:07:16 +00:00
|
|
|
|
2003-04-03 21:56:22 +00:00
|
|
|
/* from this point it's safe to "goto out" */
|
2003-03-13 00:56:43 +00:00
|
|
|
|
|
|
|
|
iter = _dbus_directory_open (&dir, error);
|
|
|
|
|
if (iter == NULL)
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("Failed to open directory %s: %s\n",
|
2004-03-12 14:07:16 +00:00
|
|
|
s_dir->dir_c,
|
|
|
|
|
error ? error->message : "unknown");
|
2003-04-03 21:56:22 +00:00
|
|
|
goto out;
|
2003-03-13 00:56:43 +00:00
|
|
|
}
|
2003-02-15 18:22:40 +00:00
|
|
|
|
|
|
|
|
/* Now read the files */
|
2003-03-13 00:56:43 +00:00
|
|
|
dbus_error_init (&tmp_error);
|
|
|
|
|
while (_dbus_directory_get_next_file (iter, &filename, &tmp_error))
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2003-03-13 00:56:43 +00:00
|
|
|
_dbus_assert (!dbus_error_is_set (&tmp_error));
|
|
|
|
|
|
|
|
|
|
_dbus_string_set_length (&full_path, 0);
|
|
|
|
|
|
2003-02-15 18:22:40 +00:00
|
|
|
if (!_dbus_string_ends_with_c_str (&filename, ".service"))
|
|
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
_dbus_verbose ("Skipping non-.service file %s\n",
|
2003-03-31 20:56:29 +00:00
|
|
|
_dbus_string_get_const_data (&filename));
|
2004-03-12 14:07:16 +00:00
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
continue;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
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 */
|
2003-03-13 00:56:43 +00:00
|
|
|
desktop_file = bus_desktop_file_load (&full_path, &tmp_error);
|
|
|
|
|
if (desktop_file == NULL)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2003-03-31 20:56:29 +00:00
|
|
|
_dbus_verbose ("Could not load %s: %s\n",
|
|
|
|
|
_dbus_string_get_const_data (&full_path),
|
2003-03-13 00:56:43 +00:00
|
|
|
tmp_error.message);
|
|
|
|
|
|
|
|
|
|
if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
|
|
|
|
|
{
|
|
|
|
|
dbus_move_error (&tmp_error, error);
|
2003-04-03 21:56:22 +00:00
|
|
|
goto out;
|
2003-03-13 00:56:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&tmp_error);
|
2003-02-15 18:22:40 +00:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
if (!update_desktop_file_entry (activation, s_dir, &filename, desktop_file, &tmp_error))
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
bus_desktop_file_free (desktop_file);
|
2003-03-13 00:56:43 +00:00
|
|
|
desktop_file = NULL;
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
_dbus_verbose ("Could not add %s to activation entry list: %s\n",
|
2003-03-31 20:56:29 +00:00
|
|
|
_dbus_string_get_const_data (&full_path), tmp_error.message);
|
2003-03-13 00:56:43 +00:00
|
|
|
|
|
|
|
|
if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
|
|
|
|
|
{
|
|
|
|
|
dbus_move_error (&tmp_error, error);
|
2003-04-03 21:56:22 +00:00
|
|
|
goto out;
|
2003-03-13 00:56:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&tmp_error);
|
|
|
|
|
continue;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
2003-03-13 00:56:43 +00:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bus_desktop_file_free (desktop_file);
|
|
|
|
|
desktop_file = NULL;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
if (dbus_error_is_set (&tmp_error))
|
|
|
|
|
{
|
|
|
|
|
dbus_move_error (&tmp_error, error);
|
2003-04-03 21:56:22 +00:00
|
|
|
goto out;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2003-04-03 21:56:22 +00:00
|
|
|
retval = TRUE;
|
2004-03-12 14:07:16 +00:00
|
|
|
|
2003-04-03 21:56:22 +00:00
|
|
|
out:
|
|
|
|
|
if (!retval)
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
else
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
2003-03-13 00:56:43 +00:00
|
|
|
|
|
|
|
|
if (iter != NULL)
|
|
|
|
|
_dbus_directory_close (iter);
|
|
|
|
|
if (desktop_file)
|
|
|
|
|
bus_desktop_file_free (desktop_file);
|
|
|
|
|
_dbus_string_free (&filename);
|
|
|
|
|
_dbus_string_free (&full_path);
|
|
|
|
|
|
2003-04-03 21:56:22 +00:00
|
|
|
return retval;
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
BusActivation*
|
2003-03-31 08:19:50 +00:00
|
|
|
bus_activation_new (BusContext *context,
|
|
|
|
|
const DBusString *address,
|
2003-04-02 00:29:33 +00:00
|
|
|
DBusList **directories,
|
2003-03-31 08:19:50 +00:00
|
|
|
DBusError *error)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2003-03-13 03:52:58 +00:00
|
|
|
BusActivation *activation;
|
2004-03-12 14:07:16 +00:00
|
|
|
DBusList *link;
|
|
|
|
|
char *dir;
|
2003-04-02 00:29:33 +00:00
|
|
|
|
2003-03-26 03:58:11 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
activation = dbus_new0 (BusActivation, 1);
|
|
|
|
|
if (activation == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
activation->refcount = 1;
|
2003-03-16 22:25:18 +00:00
|
|
|
activation->context = context;
|
2003-04-25 23:50:34 +00:00
|
|
|
activation->n_pending_activations = 0;
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
if (!_dbus_string_copy_data (address, &activation->server_address))
|
2003-03-13 00:56:43 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-02-17 09:59:23 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
activation->entries = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
|
2004-03-12 14:07:16 +00:00
|
|
|
(DBusFreeFunction)bus_activation_entry_unref);
|
2003-03-13 03:52:58 +00:00
|
|
|
if (activation->entries == NULL)
|
2003-03-13 00:56:43 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-02-15 18:22:40 +00:00
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
activation->pending_activations = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
|
2003-04-11 00:03:06 +00:00
|
|
|
(DBusFreeFunction)bus_pending_activation_unref);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
if (activation->pending_activations == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2004-03-12 14:07:16 +00:00
|
|
|
|
|
|
|
|
activation->directories = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
|
|
|
|
|
(DBusFreeFunction)bus_service_directory_unref);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
if (activation->directories == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-15 18:22:40 +00:00
|
|
|
/* Load service files */
|
2003-04-02 00:29:33 +00:00
|
|
|
link = _dbus_list_get_first_link (directories);
|
|
|
|
|
while (link != NULL)
|
2003-02-15 18:22:40 +00:00
|
|
|
{
|
2004-03-12 14:07:16 +00:00
|
|
|
BusServiceDirectory *s_dir;
|
|
|
|
|
|
|
|
|
|
dir = _dbus_strdup ((const char *) link->data);
|
|
|
|
|
if (!dir)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s_dir = dbus_new0 (BusServiceDirectory, 1);
|
|
|
|
|
if (!s_dir)
|
|
|
|
|
{
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
|
|
if (!s_dir->entries)
|
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!update_directory (activation, s_dir, error))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
2003-04-02 00:29:33 +00:00
|
|
|
link = _dbus_list_get_next_link (directories, link);
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
return activation;
|
2003-03-13 00:56:43 +00:00
|
|
|
|
|
|
|
|
failed:
|
2003-03-13 03:52:58 +00:00
|
|
|
bus_activation_unref (activation);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-27 01:25:50 +00:00
|
|
|
BusActivation *
|
2003-03-13 03:52:58 +00:00
|
|
|
bus_activation_ref (BusActivation *activation)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (activation->refcount > 0);
|
2003-03-13 00:56:43 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
activation->refcount += 1;
|
2003-11-27 01:25:50 +00:00
|
|
|
|
|
|
|
|
return activation;
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_activation_unref (BusActivation *activation)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (activation->refcount > 0);
|
|
|
|
|
|
|
|
|
|
activation->refcount -= 1;
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
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)
|
|
|
|
|
_dbus_hash_table_unref (activation->directories);
|
|
|
|
|
|
|
|
|
|
dbus_free (activation);
|
2003-02-15 18:22:40 +00:00
|
|
|
}
|
2003-02-16 10:00:37 +00:00
|
|
|
|
2003-02-17 09:59:23 +00:00
|
|
|
static void
|
|
|
|
|
child_setup (void *data)
|
|
|
|
|
{
|
2003-03-13 03:52:58 +00:00
|
|
|
BusActivation *activation = data;
|
2003-04-03 05:22:49 +00:00
|
|
|
const char *type;
|
2003-03-13 03:52:58 +00:00
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
/* If no memory, we simply have the child exit, so it won't try
|
|
|
|
|
* to connect to the wrong thing.
|
|
|
|
|
*/
|
2003-04-03 05:22:49 +00:00
|
|
|
if (!_dbus_setenv ("DBUS_ACTIVATION_ADDRESS", activation->server_address))
|
2003-03-13 00:56:43 +00:00
|
|
|
_dbus_exit (1);
|
2003-10-16 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_pending_reply_expired): either cancel or
execute, not both
(bus_connections_check_reply): use unlink, not remove_link, as we
don't want to free the link; fixes double free mess
* dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case
where no reply was received
* dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock):
fix a refcount leak
* bus/signals.c (match_rule_matches): add special cases for the
bus driver, so you can match on sender/destination for it.
* dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if
DBUS_PRINT_BACKTRACE is set
* dbus/dbus-internals.c: add pid to assertion failure messages
* dbus/dbus-connection.c: add message type code to the debug spew
* glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want
sender=foo not service=foo
* dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the
session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use
DBUS_ACTIVATION_ADDRESS instead
* bus/activation.c: set DBUS_SESSION_BUS_ADDRESS,
DBUS_SYSTEM_BUS_ADDRESS if appropriate
* bus/bus.c (bus_context_new): handle OOM copying bus type into
context struct
* dbus/dbus-message.c (dbus_message_iter_get_object_path): new function
(dbus_message_iter_get_object_path_array): new function (half
finished, disabled for the moment)
* glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle
DBUS_MESSAGE_TYPE_ERROR
* tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to
avoid redirecting stderr to /dev/null
(babysit): close stdin if not doing the "exit_with_session" thing
* dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover
debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not
stdout/stdin, so things don't get confused
* bus/system.conf.in: fix to allow replies, I modified .conf
instead of .conf.in again.
2003-10-16 06:34:51 +00:00
|
|
|
|
2003-04-03 05:22:49 +00:00
|
|
|
type = bus_context_get_type (activation->context);
|
|
|
|
|
if (type != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (!_dbus_setenv ("DBUS_BUS_TYPE", type))
|
|
|
|
|
_dbus_exit (1);
|
2003-10-16 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_pending_reply_expired): either cancel or
execute, not both
(bus_connections_check_reply): use unlink, not remove_link, as we
don't want to free the link; fixes double free mess
* dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case
where no reply was received
* dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock):
fix a refcount leak
* bus/signals.c (match_rule_matches): add special cases for the
bus driver, so you can match on sender/destination for it.
* dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if
DBUS_PRINT_BACKTRACE is set
* dbus/dbus-internals.c: add pid to assertion failure messages
* dbus/dbus-connection.c: add message type code to the debug spew
* glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want
sender=foo not service=foo
* dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the
session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use
DBUS_ACTIVATION_ADDRESS instead
* bus/activation.c: set DBUS_SESSION_BUS_ADDRESS,
DBUS_SYSTEM_BUS_ADDRESS if appropriate
* bus/bus.c (bus_context_new): handle OOM copying bus type into
context struct
* dbus/dbus-message.c (dbus_message_iter_get_object_path): new function
(dbus_message_iter_get_object_path_array): new function (half
finished, disabled for the moment)
* glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle
DBUS_MESSAGE_TYPE_ERROR
* tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to
avoid redirecting stderr to /dev/null
(babysit): close stdin if not doing the "exit_with_session" thing
* dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover
debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not
stdout/stdin, so things don't get confused
* bus/system.conf.in: fix to allow replies, I modified .conf
instead of .conf.in again.
2003-10-16 06:34:51 +00:00
|
|
|
|
|
|
|
|
if (strcmp (type, "session") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!_dbus_setenv ("DBUS_SESSION_BUS_ADDRESS",
|
|
|
|
|
activation->server_address))
|
|
|
|
|
_dbus_exit (1);
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (type, "system") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!_dbus_setenv ("DBUS_SYSTEM_BUS_ADDRESS",
|
|
|
|
|
activation->server_address))
|
|
|
|
|
_dbus_exit (1);
|
|
|
|
|
}
|
2003-04-03 05:22:49 +00:00
|
|
|
}
|
2003-02-17 09:59:23 +00:00
|
|
|
}
|
|
|
|
|
|
2003-04-11 00:03:06 +00:00
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation;
|
|
|
|
|
DBusPreallocatedHash *hash_entry;
|
|
|
|
|
} RestorePendingData;
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
restore_pending (void *data)
|
|
|
|
|
{
|
|
|
|
|
RestorePendingData *d = data;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (d->pending_activation != NULL);
|
|
|
|
|
_dbus_assert (d->hash_entry != 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
free_pending_restore_data (void *data)
|
|
|
|
|
{
|
|
|
|
|
RestorePendingData *d = data;
|
|
|
|
|
|
|
|
|
|
if (d->hash_entry)
|
|
|
|
|
_dbus_hash_table_free_preallocated_entry (d->pending_activation->activation->pending_activations,
|
|
|
|
|
d->hash_entry);
|
|
|
|
|
|
|
|
|
|
bus_pending_activation_unref (d->pending_activation);
|
|
|
|
|
|
|
|
|
|
dbus_free (d);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
add_restore_pending_to_transaction (BusTransaction *transaction,
|
|
|
|
|
BusPendingActivation *pending_activation)
|
|
|
|
|
{
|
|
|
|
|
RestorePendingData *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))
|
|
|
|
|
{
|
|
|
|
|
free_pending_restore_data (d);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_dbus_verbose ("Saved pending activation to be restored if the transaction fails\n");
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-16 10:00:37 +00:00
|
|
|
dbus_bool_t
|
2003-04-02 20:14:52 +00:00
|
|
|
bus_activation_service_created (BusActivation *activation,
|
|
|
|
|
const char *service_name,
|
|
|
|
|
BusTransaction *transaction,
|
|
|
|
|
DBusError *error)
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation;
|
|
|
|
|
DBusMessage *message;
|
|
|
|
|
DBusList *link;
|
2003-03-26 03:58:11 +00:00
|
|
|
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
/* Check if it's a pending activation */
|
|
|
|
|
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name);
|
|
|
|
|
|
|
|
|
|
if (!pending_activation)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
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))
|
|
|
|
|
{
|
2003-08-11 02:11:58 +00:00
|
|
|
message = dbus_message_new_method_return (entry->activation_message);
|
2003-03-16 22:25:18 +00:00
|
|
|
if (!message)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-14 02:29:21 +00:00
|
|
|
if (!dbus_message_append_args (message,
|
2003-03-16 22:25:18 +00:00
|
|
|
DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ACTIVATED,
|
2003-05-14 02:40:41 +00:00
|
|
|
DBUS_TYPE_INVALID))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
|
|
|
|
dbus_message_unref (message);
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2003-04-02 20:14:52 +00:00
|
|
|
|
2003-04-14 02:29:21 +00:00
|
|
|
if (!bus_transaction_send_from_driver (transaction, entry->connection, message))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
|
|
|
|
dbus_message_unref (message);
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2003-04-07 23:28:16 +00:00
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
dbus_message_unref (message);
|
2003-03-16 22:25:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
link = next;
|
|
|
|
|
}
|
2003-04-11 00:03:06 +00:00
|
|
|
|
|
|
|
|
if (!add_restore_pending_to_transaction (transaction, pending_activation))
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("Could not add cancel hook to transaction to revert removing pending activation\n");
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
_dbus_hash_table_remove_string (activation->pending_activations, service_name);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
/**
|
|
|
|
|
* FIXME @todo the error messages here would ideally be preallocated
|
|
|
|
|
* so we don't need to allocate memory to send them.
|
|
|
|
|
* Using the usual tactic, prealloc an OOM message, then
|
|
|
|
|
* if we can't alloc the real error send the OOM error instead.
|
|
|
|
|
*/
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
try_send_activation_failure (BusPendingActivation *pending_activation,
|
|
|
|
|
const DBusError *how)
|
|
|
|
|
{
|
|
|
|
|
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))
|
|
|
|
|
{
|
2003-04-27 06:25:42 +00:00
|
|
|
if (!bus_transaction_send_error_reply (transaction,
|
|
|
|
|
entry->connection,
|
|
|
|
|
how,
|
|
|
|
|
entry->activation_message))
|
2003-04-05 19:03:40 +00:00
|
|
|
goto error;
|
|
|
|
|
}
|
2003-04-27 06:25:42 +00:00
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
link = next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bus_transaction_execute_and_free (transaction);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
if (transaction)
|
|
|
|
|
bus_transaction_cancel_and_free (transaction);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Free the pending activation and send an error message to all the
|
|
|
|
|
* connections that were waiting for it.
|
|
|
|
|
*/
|
|
|
|
|
static void
|
|
|
|
|
pending_activation_failed (BusPendingActivation *pending_activation,
|
|
|
|
|
const DBusError *how)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME use preallocated OOM messages instead of bus_wait_for_memory() */
|
|
|
|
|
while (!try_send_activation_failure (pending_activation, how))
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_wait_for_memory ();
|
2003-04-05 19:03:40 +00:00
|
|
|
|
|
|
|
|
/* Destroy this pending activation */
|
|
|
|
|
_dbus_hash_table_remove_string (pending_activation->activation->pending_activations,
|
|
|
|
|
pending_activation->service_name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
babysitter_watch_callback (DBusWatch *watch,
|
|
|
|
|
unsigned int condition,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation = data;
|
|
|
|
|
dbus_bool_t retval;
|
|
|
|
|
DBusBabysitter *babysitter;
|
|
|
|
|
|
|
|
|
|
babysitter = pending_activation->babysitter;
|
|
|
|
|
|
|
|
|
|
_dbus_babysitter_ref (babysitter);
|
|
|
|
|
|
2003-04-18 04:18:57 +00:00
|
|
|
retval = dbus_watch_handle (watch, condition);
|
|
|
|
|
|
|
|
|
|
/* FIXME this is broken in the same way that
|
|
|
|
|
* connection watches used to be; there should be
|
|
|
|
|
* a separate callback for status change, instead
|
|
|
|
|
* of doing "if we handled a watch status might
|
|
|
|
|
* have changed"
|
|
|
|
|
*
|
|
|
|
|
* Fixing this lets us move dbus_watch_handle
|
|
|
|
|
* calls into dbus-mainloop.c
|
|
|
|
|
*/
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
if (_dbus_babysitter_get_child_exited (babysitter))
|
|
|
|
|
{
|
|
|
|
|
DBusError error;
|
|
|
|
|
|
|
|
|
|
dbus_error_init (&error);
|
|
|
|
|
_dbus_babysitter_set_child_exit_error (babysitter, &error);
|
|
|
|
|
|
|
|
|
|
/* Destroys the pending activation */
|
|
|
|
|
pending_activation_failed (pending_activation, &error);
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_dbus_babysitter_unref (babysitter);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
add_babysitter_watch (DBusWatch *watch,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation = data;
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
return _dbus_loop_add_watch (bus_context_get_loop (pending_activation->activation->context),
|
|
|
|
|
watch, babysitter_watch_callback, pending_activation,
|
|
|
|
|
NULL);
|
2003-04-05 19:03:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
remove_babysitter_watch (DBusWatch *watch,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation = data;
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context),
|
|
|
|
|
watch, babysitter_watch_callback, pending_activation);
|
2003-04-05 19:03:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
pending_activation_timed_out (void *data)
|
|
|
|
|
{
|
|
|
|
|
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)
|
|
|
|
|
*/
|
|
|
|
|
_dbus_babysitter_kill_child (pending_activation->babysitter);
|
|
|
|
|
|
|
|
|
|
dbus_error_init (&error);
|
|
|
|
|
|
|
|
|
|
dbus_set_error (&error, DBUS_ERROR_TIMED_OUT,
|
|
|
|
|
"Activation of %s timed out",
|
|
|
|
|
pending_activation->service_name);
|
|
|
|
|
|
|
|
|
|
pending_activation_failed (pending_activation, &error);
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&error);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-11 03:05:58 +00:00
|
|
|
static void
|
|
|
|
|
cancel_pending (void *data)
|
|
|
|
|
{
|
|
|
|
|
BusPendingActivation *pending_activation = data;
|
|
|
|
|
|
|
|
|
|
_dbus_verbose ("Canceling pending activation of %s\n",
|
|
|
|
|
pending_activation->service_name);
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
|
|
_dbus_verbose ("Saved pending activation to be canceled if the transaction fails\n");
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
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))
|
|
|
|
|
{
|
|
|
|
|
DBusError tmp_error;
|
|
|
|
|
BusServiceDirectory *s_dir;
|
|
|
|
|
|
|
|
|
|
s_dir = _dbus_hash_iter_get_value (&iter);
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&tmp_error);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static BusActivationEntry *
|
|
|
|
|
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))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
entry = _dbus_hash_table_lookup_string (activation->entries,
|
|
|
|
|
service_name);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
BusActivationEntry *updated_entry;
|
|
|
|
|
|
|
|
|
|
if (!check_service_file (activation, entry, &updated_entry, error))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
entry = updated_entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!entry)
|
|
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_ACTIVATE_SERVICE_NOT_FOUND,
|
|
|
|
|
"The service %s was not found in the activation entry list",
|
|
|
|
|
service_name);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
dbus_bool_t
|
|
|
|
|
bus_activation_activate_service (BusActivation *activation,
|
|
|
|
|
DBusConnection *connection,
|
2003-04-02 20:14:52 +00:00
|
|
|
BusTransaction *transaction,
|
2003-03-16 22:25:18 +00:00
|
|
|
DBusMessage *activation_message,
|
|
|
|
|
const char *service_name,
|
|
|
|
|
DBusError *error)
|
2003-02-16 10:00:37 +00:00
|
|
|
{
|
|
|
|
|
BusActivationEntry *entry;
|
2003-03-16 22:25:18 +00:00
|
|
|
BusPendingActivation *pending_activation;
|
|
|
|
|
BusPendingActivationEntry *pending_activation_entry;
|
|
|
|
|
DBusMessage *message;
|
|
|
|
|
DBusString service_str;
|
2003-02-16 10:00:37 +00:00
|
|
|
char *argv[2];
|
2003-03-16 22:25:18 +00:00
|
|
|
dbus_bool_t retval;
|
2003-03-26 03:58:11 +00:00
|
|
|
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
2003-04-25 23:50:34 +00:00
|
|
|
|
|
|
|
|
if (activation->n_pending_activations >=
|
|
|
|
|
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);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-02-16 10:00:37 +00:00
|
|
|
|
2004-03-12 14:07:16 +00:00
|
|
|
entry = activation_find_entry (activation, service_name, error);
|
|
|
|
|
if (!entry)
|
|
|
|
|
return FALSE;
|
2003-02-16 10:00:37 +00:00
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
/* Check if the service is active */
|
|
|
|
|
_dbus_string_init_const (&service_str, service_name);
|
|
|
|
|
if (bus_registry_lookup (bus_context_get_registry (activation->context), &service_str) != NULL)
|
|
|
|
|
{
|
2003-04-10 05:12:19 +00:00
|
|
|
_dbus_verbose ("Service \"%s\" is already active\n", service_name);
|
|
|
|
|
|
2003-08-11 02:11:58 +00:00
|
|
|
message = dbus_message_new_method_return (activation_message);
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
if (!message)
|
|
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("No memory to create reply to activate message\n");
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-14 02:29:21 +00:00
|
|
|
if (!dbus_message_append_args (message,
|
2003-03-16 22:25:18 +00:00
|
|
|
DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE,
|
2003-05-14 02:40:41 +00:00
|
|
|
DBUS_TYPE_INVALID))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("No memory to set args of reply to activate message\n");
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
dbus_message_unref (message);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-14 02:29:21 +00:00
|
|
|
retval = bus_transaction_send_from_driver (transaction, connection, message);
|
2003-03-16 22:25:18 +00:00
|
|
|
dbus_message_unref (message);
|
|
|
|
|
if (!retval)
|
2003-04-11 03:05:58 +00:00
|
|
|
{
|
|
|
|
|
_dbus_verbose ("Failed to send reply\n");
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
}
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pending_activation_entry = dbus_new0 (BusPendingActivationEntry, 1);
|
|
|
|
|
if (!pending_activation_entry)
|
|
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to create pending activation entry\n");
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pending_activation_entry->activation_message = activation_message;
|
|
|
|
|
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)
|
|
|
|
|
{
|
2003-03-17 02:26:41 +00:00
|
|
|
if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to append a new entry to pending activation\n");
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-25 23:50:34 +00:00
|
|
|
|
|
|
|
|
pending_activation->n_entries += 1;
|
|
|
|
|
pending_activation->activation->n_pending_activations += 1;
|
2003-03-16 22:25:18 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pending_activation = dbus_new0 (BusPendingActivation, 1);
|
|
|
|
|
if (!pending_activation)
|
|
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to create pending activation\n");
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-05 19:03:40 +00:00
|
|
|
|
|
|
|
|
pending_activation->activation = activation;
|
2003-04-11 00:03:06 +00:00
|
|
|
pending_activation->refcount = 1;
|
2003-04-05 19:03:40 +00:00
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
pending_activation->service_name = _dbus_strdup (service_name);
|
|
|
|
|
if (!pending_activation->service_name)
|
|
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to copy service name for pending activation\n");
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_unref (pending_activation);
|
2003-03-16 22:25:18 +00:00
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
pending_activation->timeout =
|
|
|
|
|
_dbus_timeout_new (bus_context_get_activation_timeout (activation->context),
|
|
|
|
|
pending_activation_timed_out,
|
|
|
|
|
pending_activation,
|
|
|
|
|
NULL);
|
|
|
|
|
if (!pending_activation->timeout)
|
|
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to create timeout for pending activation\n");
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_unref (pending_activation);
|
2003-04-05 19:03:40 +00:00
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
if (!_dbus_loop_add_timeout (bus_context_get_loop (activation->context),
|
|
|
|
|
pending_activation->timeout,
|
|
|
|
|
handle_timeout_callback,
|
|
|
|
|
pending_activation,
|
|
|
|
|
NULL))
|
2003-04-05 19:03:40 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to add timeout for pending activation\n");
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_unref (pending_activation);
|
2003-04-05 19:03:40 +00:00
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pending_activation->timeout_added = TRUE;
|
|
|
|
|
|
2003-03-17 02:26:41 +00:00
|
|
|
if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to add entry to just-created pending activation\n");
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_unref (pending_activation);
|
2003-03-16 22:25:18 +00:00
|
|
|
bus_pending_activation_entry_free (pending_activation_entry);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-25 23:50:34 +00:00
|
|
|
|
|
|
|
|
pending_activation->n_entries += 1;
|
|
|
|
|
pending_activation->activation->n_pending_activations += 1;
|
2003-03-16 22:25:18 +00:00
|
|
|
|
|
|
|
|
if (!_dbus_hash_table_insert_string (activation->pending_activations,
|
2003-04-11 03:05:58 +00:00
|
|
|
pending_activation->service_name,
|
|
|
|
|
pending_activation))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to put pending activation in hash table\n");
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 00:03:06 +00:00
|
|
|
bus_pending_activation_unref (pending_activation);
|
2003-03-16 22:25:18 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-04-11 03:05:58 +00:00
|
|
|
|
|
|
|
|
if (!add_cancel_pending_to_transaction (transaction, pending_activation))
|
|
|
|
|
{
|
|
|
|
|
_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);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-03-16 22:25:18 +00:00
|
|
|
|
2003-03-13 00:56:43 +00:00
|
|
|
/* FIXME we need to support a full command line, not just a single
|
|
|
|
|
* argv[0]
|
|
|
|
|
*/
|
|
|
|
|
|
2003-02-16 10:00:37 +00:00
|
|
|
/* Now try to spawn the process */
|
|
|
|
|
argv[0] = entry->exec;
|
|
|
|
|
argv[1] = NULL;
|
|
|
|
|
|
2003-04-05 19:03:40 +00:00
|
|
|
if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
|
2003-04-05 00:37:17 +00:00
|
|
|
child_setup, activation,
|
|
|
|
|
error))
|
2003-03-16 22:25:18 +00:00
|
|
|
{
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to spawn child\n");
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
2003-03-16 22:25:18 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-05 19:03:40 +00:00
|
|
|
|
|
|
|
|
_dbus_assert (pending_activation->babysitter != NULL);
|
|
|
|
|
|
|
|
|
|
if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter,
|
|
|
|
|
add_babysitter_watch,
|
|
|
|
|
remove_babysitter_watch,
|
|
|
|
|
NULL,
|
|
|
|
|
pending_activation,
|
|
|
|
|
NULL))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
2003-04-11 03:05:58 +00:00
|
|
|
_dbus_verbose ("Failed to set babysitter watch functions\n");
|
2003-04-05 19:03:40 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-03-16 22:25:18 +00:00
|
|
|
|
2003-02-16 10:00:37 +00:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
2004-03-12 14:07:16 +00:00
|
|
|
|
|
|
|
|
#ifdef DBUS_BUILD_TESTS
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
#define SERVICE_NAME_1 "MyService1"
|
|
|
|
|
#define SERVICE_NAME_2 "MyService2"
|
|
|
|
|
#define SERVICE_NAME_3 "MyService3"
|
|
|
|
|
|
|
|
|
|
#define SERVICE_FILE_1 "service-1.service"
|
|
|
|
|
#define SERVICE_FILE_2 "service-2.service"
|
|
|
|
|
#define SERVICE_FILE_3 "service-3.service"
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
test_create_service_file (DBusString *dir,
|
|
|
|
|
const char *filename,
|
|
|
|
|
const char *name,
|
|
|
|
|
const char *exec)
|
|
|
|
|
{
|
|
|
|
|
DBusString file_name, full_path;
|
|
|
|
|
FILE *file;
|
|
|
|
|
dbus_bool_t ret_val;
|
|
|
|
|
|
|
|
|
|
ret_val = TRUE;
|
|
|
|
|
_dbus_string_init_const (&file_name, filename);
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&full_path))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_append (&full_path, _dbus_string_get_const_data (dir)) ||
|
|
|
|
|
!_dbus_concat_dir_and_file (&full_path, &file_name))
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
file = fopen (_dbus_string_get_const_data (&full_path), "w");
|
|
|
|
|
if (!file)
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fprintf (file, "[D-BUS Service]\nName=%s\nExec=%s\n", name, exec);
|
|
|
|
|
fclose (file);
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
_dbus_string_free (&full_path);
|
|
|
|
|
return ret_val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
test_remove_service_file (DBusString *dir, const char *filename)
|
|
|
|
|
{
|
|
|
|
|
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))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_append (&full_path, _dbus_string_get_const_data (dir)) ||
|
|
|
|
|
!_dbus_concat_dir_and_file (&full_path, &file_name))
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_dbus_delete_file (&full_path, NULL))
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
_dbus_string_free (&full_path);
|
|
|
|
|
return ret_val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
test_remove_directory (DBusString *dir)
|
|
|
|
|
{
|
|
|
|
|
DBusDirIter *iter;
|
|
|
|
|
DBusString filename, full_path;
|
|
|
|
|
dbus_bool_t ret_val;
|
|
|
|
|
|
|
|
|
|
ret_val = TRUE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&filename))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&full_path))
|
|
|
|
|
{
|
|
|
|
|
_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))
|
|
|
|
|
{
|
|
|
|
|
if (!test_remove_service_file (dir, _dbus_string_get_const_data (&filename)))
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_dbus_directory_close (iter);
|
|
|
|
|
|
|
|
|
|
if (!_dbus_delete_directory (dir, NULL))
|
|
|
|
|
{
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
_dbus_string_free (&filename);
|
|
|
|
|
_dbus_string_free (&full_path);
|
|
|
|
|
|
|
|
|
|
return ret_val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
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
|
|
|
|
|
{
|
|
|
|
|
if (!test_remove_directory (dir))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_create_directory (dir, NULL))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create one initial file */
|
|
|
|
|
if (!test_create_service_file (dir, SERVICE_FILE_1, SERVICE_NAME_1, "exec-1"))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
cleanup_service_reload_test (DBusString *dir)
|
|
|
|
|
{
|
|
|
|
|
if (!test_remove_directory (dir))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
BusActivation *activation;
|
|
|
|
|
const char *service_name;
|
|
|
|
|
dbus_bool_t expecting_find;
|
|
|
|
|
} CheckData;
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
check_func (void *data)
|
|
|
|
|
{
|
|
|
|
|
CheckData *d;
|
|
|
|
|
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))
|
|
|
|
|
{
|
|
|
|
|
ret_val = TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (d->expecting_find)
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_error_free (&error);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (!d->expecting_find)
|
|
|
|
|
ret_val = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret_val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
do_test (const char *description, dbus_bool_t oom_test, CheckData *data)
|
|
|
|
|
{
|
|
|
|
|
dbus_bool_t err;
|
|
|
|
|
|
|
|
|
|
if (oom_test)
|
|
|
|
|
err = !_dbus_test_oom_handling (description, check_func, data);
|
|
|
|
|
else
|
|
|
|
|
err = !check_func (data);
|
|
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
|
_dbus_assert_not_reached ("Test failed");
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
do_service_reload_test (DBusString *dir, dbus_bool_t oom_test)
|
|
|
|
|
{
|
|
|
|
|
BusActivation *activation;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
if (!do_test ("Existing service file", oom_test, &d))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Check for non-existing service file */
|
|
|
|
|
d.expecting_find = FALSE;
|
|
|
|
|
d.service_name = SERVICE_NAME_3;
|
|
|
|
|
|
|
|
|
|
if (!do_test ("Nonexisting service file", oom_test, &d))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Check for added service file */
|
|
|
|
|
if (!test_create_service_file (dir, SERVICE_FILE_2, SERVICE_NAME_2, "exec-2"))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
d.expecting_find = FALSE;
|
|
|
|
|
d.service_name = SERVICE_FILE_2;
|
|
|
|
|
|
|
|
|
|
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"))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
d.expecting_find = TRUE;
|
|
|
|
|
d.service_name = SERVICE_NAME_3;
|
|
|
|
|
|
|
|
|
|
if (!do_test ("Updated service file, part 1", oom_test, &d))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
d.expecting_find = FALSE;
|
|
|
|
|
d.service_name = SERVICE_NAME_1;
|
|
|
|
|
|
|
|
|
|
if (!do_test ("Updated service file, part 2", oom_test, &d))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
bus_activation_unref (activation);
|
|
|
|
|
_dbus_list_clear (&directories);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_bool_t
|
|
|
|
|
bus_activation_service_reload_test (const DBusString *test_data_dir)
|
|
|
|
|
{
|
|
|
|
|
DBusString directory;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&directory))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_append (&directory, "/tmp/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 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));
|
|
|
|
|
|
|
|
|
|
/* Cleanup test directory */
|
|
|
|
|
if (!cleanup_service_reload_test (&directory))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
_dbus_string_free (&directory);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* DBUS_BUILD_TESTS */
|