2003-09-21 Havoc Pennington <hp@pobox.com>

	Get matching rules mostly working in the bus; only actually
	parsing the rule text remains. However, the client side of
	"signal connections" hasn't been started, this patch is only the
	bus side.

	* dbus/dispatch.c: fix for the matching rules changes

	* bus/driver.c (bus_driver_handle_remove_match)
	(bus_driver_handle_add_match): send an ack reply from these
	method calls

	* glib/dbus-gproxy.c (dbus_gproxy_begin_call): fix order of
	arguments, reported by Seth Nickell

	* bus/config-parser.c (append_rule_from_element): support
	eavesdrop=true|false attribute on policies so match rules
	can be prevented from snooping on the system bus.

	* bus/dbus-daemon-1.1.in: consistently use terminology "sender"
	and "destination" in attribute names; fix some docs bugs;
	add eavesdrop=true|false attribute

	* bus/driver.c (bus_driver_handle_add_match)
	(bus_driver_handle_remove_match): handle AddMatch, RemoveMatch
	messages

	* dbus/dbus-protocol.h (DBUS_SERVICE_ORG_FREEDESKTOP_BROADCAST): get
	rid of broadcast service concept, signals are just always broadcast

	* bus/signals.c, bus/dispatch.c, bus/connection.c, bus/bus.c:
	mostly implement matching rules stuff (currently only exposed as signal
	connections)

1 files changed, 38 insertions, 33 deletions

diff --git a/bus/bus.h b/bus/bus.h
index 8f32d7a9..5809321a 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -40,7 +40,8 @@ typedef struct BusPolicyRule    BusPolicyRule;
 typedef struct BusRegistry      BusRegistry;
 typedef struct BusService       BusService;
 typedef struct BusTransaction   BusTransaction;
-
+typedef struct BusMatchmaker    BusMatchmaker;
+typedef struct BusMatchRule     BusMatchRule;
 
 typedef struct
 {
@@ -54,40 +55,44 @@ typedef struct
   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 */
 } BusLimits;
 
-BusContext*       bus_context_new                             (const DBusString *config_file,
-                                                               dbus_bool_t       force_fork,
-                                                               int               print_addr_fd,
-                                                               int               print_pid_fd,
-                                                               DBusError        *error);
-void              bus_context_shutdown                        (BusContext       *context);
-void              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);
-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);
-BusClientPolicy*  bus_context_create_client_policy            (BusContext       *context,
-                                                               DBusConnection   *connection,
-                                                               DBusError        *error);
+BusContext*       bus_context_new                                (const DBusString *config_file,
+                                                                  dbus_bool_t       force_fork,
+                                                                  int               print_addr_fd,
+                                                                  int               print_pid_fd,
+                                                                  DBusError        *error);
+void              bus_context_shutdown                           (BusContext       *context);
+void              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);
+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);
+dbus_bool_t       bus_context_check_security_policy              (BusContext       *context,
+                                                                  DBusConnection   *sender,
+                                                                  DBusConnection   *addressed_recipient,
+                                                                  DBusConnection   *proposed_recipient,
+                                                                  DBusMessage      *message,
+                                                                  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);
-dbus_bool_t       bus_context_check_security_policy           (BusContext       *context,
-                                                               DBusConnection   *sender,
-                                                               DBusConnection   *recipient,
-                                                               DBusMessage      *message,
-                                                               DBusError        *error);
 
 #endif /* BUS_BUS_H */