mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-03 01:57:58 +02:00
1a163e765c
Makefile list * dbus/dbus-shared.h (#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT): New flag which replaces DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT (#define DBUS_NAME_FLAG_DO_NOT_QUEUE): New flag for specifying not to queue an ower if it can't be the primary owner * bus/bus.h: Add new internal BusOwner struct * bus/driver.c (bus_driver_handle_hello): Send flags (0 for default) to bus_registry_ensure and don't set the prohibit_replacement flag since they are now set per BusOwner and not per name. (bus_driver_handle_list_queued_owners): bus method (ListQueuedOwners) that returns the list of connections in a name's connection queue * bus/services.c (struct BusService): remove prohibit_replacement field (struct BusOwner): new struct for keeping track of queued connections and their associated flags for the queue (struct BusRegistry): add a BusOwner memory pool (bus_registry_new): initialize the BusOwner memory pool (bus_registry_unref): free the BusOwner memory pool (_bus_service_find_owner_link): new internal method for searching the queue for a specific connection (bus_owner_set_flags): new method for adding setting the flags on a bus owner (bus_owner_new): new method that creates a BusOwner object from the pool and sets its flags (bus_owner_ref, bus_owner_unref): ref counting for BusOwner objects (bus_registry_ensure): Add the flags parameter (bus_registry_acquire_service): Switch from using raw connections to using the BusOwner struct Add new state machine for dealing with the new set of flags (bus_registry_set_service_context_table, struct OwnershipCancelData, cancel_ownership, free_ownership_cancel_data, add_cancel_ownership_to_transaction, struct OwnershipRestoreData, restore_ownership, free_ownership_restore_data, add_restore_ownership_to_transaction): Switch to using BusOwner instead of raw connections (bus_service_add_owner): Add flags parameter Switch to using BusOwner instead of raw connections Add state machine for dealing with the new set of flags (bus_service_swap_owner): Swaps the first and second owners in the queue. Used to make sure proper signals are sent when a service looses or gains primary ownership. We never insert an owner at the top of the queue. Instead we insert it in the second position and then swap. (bus_service_remove_owner): Remove the owner from the queue sending out the NameLost and NameOwnerChanged signals if the we were the primary owner (bus_service_get_primary_owners_connection): New method that extracts the connection from the primary owner (bus_service_get_primary_owner): Returns the BusOwner instead of the connection (bus_service_get_allow_replacement): Changed from the old bus_service_get_prohibit_replacement method. Checks the flags of the primary owner and returns if it can be replaced or not (bus_service_set_prohibit_replacement): removed (bus_service_has_owner): returns TRUE if and owner with the specified connection exists in the queue * dbus/dbus-bus.c (dbus_bus_connection_get_unique_name): New helper method that only compiles if tests are enabled. Allows us to get the unique name of a connection so we can check it against the queue when doing regression tests * bus/activation.c (bus_activation_send_pending_auto_activate), bus/dispatch.c (bus_dispatch), bus/driver.c (bus_driver_handle_get_service_owner, bus_driver_handle_get_connection_unix_user, bus_driver_handle_get_connection_unix_process_id, bus_driver_handle_get_connection_selinux_security_context), bus/signals.c (connection_is_primary_owner): use bus_service_get_primary_owners_connection instead of bus_service_get_primary_owner * dbus/dbus-sysdeps.c (_dbus_connect_unix_socket, _dbus_listen_unix_socket): Calculate the length of the socket path and use that instead of using a fixed length which was causing socket names to contain many trailing Nul bytes. * dbus/dbus-glib-lowlevel.h, glib/dbus-gobject.c (dbus_g_method_get_sender): New method for extracting the sender from a DBusGMethodInvocation (dbus_g_method_return_get_reply): changed name to dbus_g_method_get_reply (dbus_g_method_return_send_reply): changed name to dbus_g_method_send reply * doc/dbus-specification.xml: New docs that describe how the new queueing system works and talks about the changes to the how we specify socket names * glib/examples/example-service.c, glib/examples/example-signal-emitter.c, glib/examples/statemachine/statemachine-server.c: Changed the RequestName flags to the new system * test/name-test/ (test-names.c, run-test.sh, Makefile.am): New regression test suite for testing various states of the new queueing system
116 lines
6.7 KiB
C
116 lines
6.7 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* bus.h message bus context object
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (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
|
|
*
|
|
*/
|
|
|
|
#ifndef BUS_BUS_H
|
|
#define BUS_BUS_H
|
|
|
|
#include <config.h>
|
|
|
|
#include <dbus/dbus.h>
|
|
#include <dbus/dbus-string.h>
|
|
#include <dbus/dbus-mainloop.h>
|
|
#include <dbus/dbus-userdb.h>
|
|
|
|
typedef struct BusActivation BusActivation;
|
|
typedef struct BusConnections BusConnections;
|
|
typedef struct BusContext BusContext;
|
|
typedef struct BusPolicy BusPolicy;
|
|
typedef struct BusClientPolicy BusClientPolicy;
|
|
typedef struct BusPolicyRule BusPolicyRule;
|
|
typedef struct BusRegistry BusRegistry;
|
|
typedef struct BusSELinuxID BusSELinuxID;
|
|
typedef struct BusService BusService;
|
|
typedef struct BusOwner BusOwner;
|
|
typedef struct BusTransaction BusTransaction;
|
|
typedef struct BusMatchmaker BusMatchmaker;
|
|
typedef struct BusMatchRule BusMatchRule;
|
|
|
|
typedef struct
|
|
{
|
|
long max_incoming_bytes; /**< How many incoming message bytes for a single connection */
|
|
long max_outgoing_bytes; /**< How many outgoing bytes can be queued for a single connection */
|
|
long max_message_size; /**< Max size of a single message in bytes */
|
|
int activation_timeout; /**< How long to wait for an activation to time out */
|
|
int auth_timeout; /**< How long to wait for an authentication to time out */
|
|
int max_completed_connections; /**< Max number of authorized connections */
|
|
int max_incomplete_connections; /**< Max number of incomplete connections */
|
|
int max_connections_per_user; /**< Max number of connections auth'd as same user */
|
|
int max_pending_activations; /**< Max number of pending activations for the entire bus */
|
|
int max_services_per_connection; /**< Max number of owned services for a single connection */
|
|
int max_match_rules_per_connection; /**< Max number of match rules for a single connection */
|
|
int max_replies_per_connection; /**< Max number of replies that can be pending for each connection */
|
|
int reply_timeout; /**< How long to wait before timing out a reply */
|
|
} BusLimits;
|
|
|
|
typedef enum
|
|
{
|
|
FORK_FOLLOW_CONFIG_FILE,
|
|
FORK_ALWAYS,
|
|
FORK_NEVER
|
|
} ForceForkSetting;
|
|
|
|
BusContext* bus_context_new (const DBusString *config_file,
|
|
ForceForkSetting force_fork,
|
|
int print_addr_fd,
|
|
int print_pid_fd,
|
|
DBusError *error);
|
|
dbus_bool_t bus_context_reload_config (BusContext *context,
|
|
DBusError *error);
|
|
void bus_context_shutdown (BusContext *context);
|
|
BusContext* bus_context_ref (BusContext *context);
|
|
void bus_context_unref (BusContext *context);
|
|
const char* bus_context_get_type (BusContext *context);
|
|
const char* bus_context_get_address (BusContext *context);
|
|
BusRegistry* bus_context_get_registry (BusContext *context);
|
|
BusConnections* bus_context_get_connections (BusContext *context);
|
|
BusActivation* bus_context_get_activation (BusContext *context);
|
|
BusMatchmaker* bus_context_get_matchmaker (BusContext *context);
|
|
DBusLoop* bus_context_get_loop (BusContext *context);
|
|
DBusUserDatabase* bus_context_get_user_database (BusContext *context);
|
|
|
|
dbus_bool_t bus_context_allow_user (BusContext *context,
|
|
unsigned long uid);
|
|
BusPolicy* bus_context_get_policy (BusContext *context);
|
|
|
|
BusClientPolicy* bus_context_create_client_policy (BusContext *context,
|
|
DBusConnection *connection,
|
|
DBusError *error);
|
|
int bus_context_get_activation_timeout (BusContext *context);
|
|
int bus_context_get_auth_timeout (BusContext *context);
|
|
int bus_context_get_max_completed_connections (BusContext *context);
|
|
int bus_context_get_max_incomplete_connections (BusContext *context);
|
|
int bus_context_get_max_connections_per_user (BusContext *context);
|
|
int bus_context_get_max_pending_activations (BusContext *context);
|
|
int bus_context_get_max_services_per_connection (BusContext *context);
|
|
int bus_context_get_max_match_rules_per_connection (BusContext *context);
|
|
int bus_context_get_max_replies_per_connection (BusContext *context);
|
|
int bus_context_get_reply_timeout (BusContext *context);
|
|
dbus_bool_t bus_context_check_security_policy (BusContext *context,
|
|
BusTransaction *transaction,
|
|
DBusConnection *sender,
|
|
DBusConnection *addressed_recipient,
|
|
DBusConnection *proposed_recipient,
|
|
DBusMessage *message,
|
|
DBusError *error);
|
|
|
|
#endif /* BUS_BUS_H */
|