2003-02-16 Anders Carlsson <andersca@codefactory.se>

	* bus/dispatch.c: (bus_dispatch_message_handler):
	* dbus/dbus-errors.h:
	Return an error if someone tries to send a message to a service
	that doesn't exist.

diff --git a/ChangeLog b/ChangeLog
index afb58cf4afd48eef5292dc48f97848a92d5ab69d..662ce24045123d499dec2fe8f0370041ac2082d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-16  Anders Carlsson  <andersca@codefactory.se>
+
+       * bus/dispatch.c: (bus_dispatch_message_handler):
+       * dbus/dbus-errors.h:
+       Return an error if someone tries to send a message to a service
+       that doesn't exist.
+       
 2003-02-16  Anders Carlsson  <andersca@codefactory.se>
 
        * bus/activation.c: (load_directory), (bus_activation_init),

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 4e42f9a0105f4662629d40e525aaa641fe52feb8..2ce26ae13ed1935a1cc35297e78bce90948b47bb 100644 (file)
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -88,11 +88,38 @@ bus_dispatch_message_handler (DBusMessageHandler *handler,
       _dbus_string_init_const (&service_string, service_name);
       service = bus_service_lookup (&service_string, FALSE);
 
-      _dbus_assert (bus_service_get_primary_owner (service) != NULL);
+      if (!service)
+       {
+         DBusMessage *error_reply;
+         DBusString error_message;
+         const char *error_str;
+         
+         /* Trying to send a message to a non-existant service,
+            bounce back an error message. */
+         
+         BUS_HANDLE_OOM (_dbus_string_init (&error_message, _DBUS_INT_MAX));
+
+         BUS_HANDLE_OOM (_dbus_string_append (&error_message, "Service \""));
+         BUS_HANDLE_OOM (_dbus_string_append (&error_message, service_name));
+         BUS_HANDLE_OOM (_dbus_string_append (&error_message, "does not exist"));        
+
+         _dbus_string_get_const_data (&error_message, &error_str);
+         BUS_HANDLE_OOM (error_reply = dbus_message_new_error_reply (message, DBUS_ERROR_SERVICE_DOES_NOT_EXIST,
+                                                                     error_str));
+         _dbus_string_free (&error_message);
+
+         /* Dispatch the message */
+         BUS_HANDLE_OOM (dbus_connection_send_message (connection, error_reply, NULL, NULL));
+         dbus_message_unref (error_reply);
+       }
+      else
+       {
+         _dbus_assert (bus_service_get_primary_owner (service) != NULL);
       
-      /* Dispatch the message */
-      BUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service),
-                                                   message, NULL, NULL));
+         /* Dispatch the message */
+         BUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service),
+                                                       message, NULL, NULL));
+       }
     }
 
   return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;

diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h
index 1b7b474a1197e7c6708b27ff34d9bca90ff146db..fd861feb7c2d408a727384bc36a6622fdc5e0594 100644 (file)
--- a/dbus/dbus-errors.h
+++ b/dbus/dbus-errors.h
@@ -53,6 +53,7 @@ struct DBusError
 #define DBUS_ERROR_SPAWN_FORK_FAILED          "org.freedesktop.DBus.Error.Spawn.ForkFailed"
 #define DBUS_ERROR_SPAWN_FAILED               "org.freedesktop.DBus.Error.Spawn.Failed"
 #define DBUS_ERROR_NO_MEMORY                  "org.freedesktop.DBus.Error.NoMemory"
+#define DBUS_ERROR_SERVICE_DOES_NOT_EXIST     "org.freedesktop.DBus.Error.ServiceDoesNotExist"
 
 typedef enum
 {