From 75742242000e782719bc1656f0a7da72b059e88e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 21 Oct 2003 05:46:52 +0000 Subject: 2003-10-20 Havoc Pennington hmm, make check is currently not passing. * doc/dbus-specification.xml: add requirement that custom type names follow the same rules as interface names. * dbus/dbus-protocol.h: change some of the byte codes, to avoid duplication and allow 'c' to be 'custom'; dict is now 'm' for 'map' * doc/dbus-specification.xml: update type codes to match dbus-protocol.h, using the ASCII byte values. Rename type NAMED to CUSTOM. Add type OBJECT_PATH to the spec. 2003-10-17 Havoc Pennington * bus/driver.c (create_unique_client_name): use "." as separator in base service names instead of '-' * dbus/dbus-string.c (_dbus_string_get_byte): allow getting nul byte at the end of the string * dbus/dbus-internals.h (_DBUS_LIKELY, _DBUS_UNLIKELY): add optimization macros since string validation seems to be a slow point. * doc/dbus-specification.xml: restrict valid service/interface/member/error names. Add test suite code for the name validation. * dbus/dbus-string.c: limit service/interface/member/error names to [0-9][A-Z][a-z]_ * dbus/dbus-connection.c (dbus_connection_dispatch): add missing format arg to verbose spew * glib/dbus-gproxy.c (dbus_gproxy_call_no_reply): if not out of memory, return instead of g_error * test/test-service.c (path_message_func): support emitting a signal on request * dbus/dbus-bus.c (init_connections_unlocked): only fill in activation bus type if DBUS_BUS_ACTIVATION was set; default to assuming the activation bus was the session bus so that services started manually will still register. (init_connections_unlocked): fix so that in OOM situation we get the same semantics when retrying the function * test/test-service.c (main): change to use path registration, to test those codepaths; register with DBUS_BUS_ACTIVATION rather than DBUS_BUS_SESSION --- test/test-service.c | 88 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 12 deletions(-) (limited to 'test/test-service.c') diff --git a/test/test-service.c b/test/test-service.c index c72a43af..6f77c3da 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -28,6 +28,8 @@ handle_echo (DBusConnection *connection, DBusError error; DBusMessage *reply; char *s; + + _dbus_verbose ("sending reply to Echo method\n"); dbus_error_init (&error); @@ -72,21 +74,77 @@ handle_echo (DBusConnection *connection, return DBUS_HANDLER_RESULT_HANDLED; } +static void +path_unregistered_func (DBusConnection *connection, + void *user_data) +{ + /* connection was finalized */ +} + static DBusHandlerResult -filter_func (DBusConnection *connection, - DBusMessage *message, - void *user_data) -{ +path_message_func (DBusConnection *connection, + DBusMessage *message, + void *user_data) +{ if (dbus_message_is_method_call (message, "org.freedesktop.TestSuite", "Echo")) return handle_echo (connection, message); else if (dbus_message_is_method_call (message, "org.freedesktop.TestSuite", - "Exit") || - dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, - "Disconnected")) + "Exit")) + { + dbus_connection_disconnect (connection); + quit (); + return DBUS_HANDLER_RESULT_HANDLED; + } + else if (dbus_message_is_method_call (message, + "org.freedesktop.TestSuite", + "EmitFoo")) + { + /* Emit the Foo signal */ + DBusMessage *signal; + + _dbus_verbose ("emitting signal Foo\n"); + + signal = dbus_message_new_signal ("/org/freedesktop/TestSuite", + "org.freedesktop.TestSuite", + "Foo"); + if (signal == NULL) + die ("No memory\n"); + + if (!dbus_message_append_args (signal, + DBUS_TYPE_DOUBLE, 42.6, + DBUS_TYPE_INVALID)) + die ("No memory"); + + if (!dbus_connection_send (connection, signal, NULL)) + die ("No memory\n"); + + return DBUS_HANDLER_RESULT_HANDLED; + } + else + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +static DBusObjectPathVTable +echo_vtable = { + path_unregistered_func, + path_message_func, + NULL, +}; + +/* Pre-exploded path, "/org/freedesktop/TestSuite" */ +static const char* echo_path[] = { "org", "freedesktop", "TestSuite", NULL }; + +static DBusHandlerResult +filter_func (DBusConnection *connection, + DBusMessage *message, + void *user_data) +{ + if (dbus_message_is_signal (message, + DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + "Disconnected")) { dbus_connection_disconnect (connection); quit (); @@ -107,11 +165,11 @@ main (int argc, int result; dbus_error_init (&error); - connection = dbus_bus_get (DBUS_BUS_SESSION, &error); + connection = dbus_bus_get (DBUS_BUS_ACTIVATION, &error); if (connection == NULL) { - _dbus_verbose ("*** Failed to open connection to activating message bus: %s\n", - error.message); + fprintf (stderr, "*** Failed to open connection to activating message bus: %s\n", + error.message); dbus_error_free (&error); return 1; } @@ -127,13 +185,19 @@ main (int argc, filter_func, NULL, NULL)) die ("No memory"); + if (!dbus_connection_register_object_path (connection, + echo_path, + &echo_vtable, + NULL)) + die ("No memory"); + printf ("Acquiring service\n"); result = dbus_bus_acquire_service (connection, "org.freedesktop.DBus.TestSuiteEchoService", 0, &error); if (dbus_error_is_set (&error)) { - printf ("Error %s", error.message); + fprintf (stderr, "Error %s", error.message); _dbus_verbose ("*** Failed to acquire service: %s\n", error.message); dbus_error_free (&error); -- cgit