diff options
author | Anders Carlsson <andersca@codefactory.se> | 2003-01-27 11:20:55 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@codefactory.se> | 2003-01-27 11:20:55 +0000 |
commit | ee1133de4dc5e181be5d09f084d8823388d5f693 (patch) | |
tree | c4641ef545f3ce65bfeb79ab4236ef71f785687c /bus/dispatch.c | |
parent | 2f440457d5fe45afb732820da64a147157e2e82d (diff) |
2003-01-27 Anders Carlsson <andersca@codefactory.se>
* bus/dispatch.c: (bus_dispatch_message_handler):
Dispatch messages sent to services.
* bus/driver.c: (bus_driver_send_service_deleted),
(bus_driver_send_service_created), (bus_driver_send_service_lost),
(bus_driver_send_service_acquired):
Add helper functions for sending service related messages.
(bus_driver_send_welcome_message):
Send HELLO_REPLY instead of WELCOME.
(bus_driver_handle_list_services):
Send LIST_SERVICES_REPLY instead of SERVICES.
(bus_driver_handle_own_service),
(bus_driver_handle_service_exists):
New message handlers.
(bus_driver_handle_message):
Invoke new message handlers.
(bus_driver_remove_connection):
Don't remove any services here since that's done automatically
by bus_service_remove_owner now.
* bus/driver.h:
New function signatures.
* bus/services.c: (bus_service_add_owner):
Send ServiceAcquired message if we're the only primary owner.
(bus_service_remove_owner):
Send ServiceAcquired/ServiceLost messages.
(bus_service_set_prohibit_replacement),
(bus_service_get_prohibit_replacement):
Functions for setting prohibit replacement.
(bus_service_has_owner):
New function that checks if a connection is in the owner queue of
a certain service.
* bus/services.h:
Add new function signatures.
* dbus/dbus-list.c: (_dbus_list_test):
Add tests for _dbus_list_remove_last and traversing the list backwards.
* dbus/dbus-list.h:
Fix a typo in _dbus_list_get_prev_link, if we're at the first element we can't
go any further, so return NULL then.
* dbus/dbus-protocol.h:
Add new messages, service flags and service replies.
Diffstat (limited to 'bus/dispatch.c')
-rw-r--r-- | bus/dispatch.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index a74b3719..a02916be 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -50,16 +50,16 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, DBusMessage *message, void *user_data) { - const char *sender, *service; + const char *sender, *service_name; /* Assign a sender to the message */ sender = bus_connection_get_name (connection); _DBUS_HANDLE_OOM (dbus_message_set_sender (message, sender)); - service = dbus_message_get_service (message); + service_name = dbus_message_get_service (message); /* See if the message is to the driver */ - if (strcmp (service, DBUS_SERVICE_DBUS) == 0) + if (strcmp (service_name, DBUS_SERVICE_DBUS) == 0) { bus_driver_handle_message (connection, message); } @@ -68,13 +68,23 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, _dbus_verbose ("Received message from non-registered client. Disconnecting.\n"); dbus_connection_disconnect (connection); } - else if (strcmp (service, DBUS_SERVICE_BROADCAST) == 0) + else if (strcmp (service_name, DBUS_SERVICE_BROADCAST) == 0) { bus_dispatch_broadcast_message (message); } else { + DBusString service_string; + BusService *service; + + _dbus_string_init_const (&service_string, service_name); + service = bus_service_lookup (&service_string, FALSE); + + _dbus_assert (bus_service_get_primary_owner (service) != NULL); + /* Dispatch the message */ + _DBUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service), + message, NULL, NULL)); } return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS; @@ -118,7 +128,7 @@ bus_dispatch_remove_connection (DBusConnection *connection) { /* Here we tell the bus driver that we want to get off. */ bus_driver_remove_connection (connection); - + dbus_connection_set_data (connection, message_handler_slot, NULL, NULL); |