From d6e1b2adb3d8e51ce1bb47295cef12d9fe1a15a8 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 16 Oct 2003 06:34:51 +0000 Subject: 2003-10-16 Havoc Pennington * bus/connection.c (bus_pending_reply_expired): either cancel or execute, not both (bus_connections_check_reply): use unlink, not remove_link, as we don't want to free the link; fixes double free mess * dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case where no reply was received * dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock): fix a refcount leak * bus/signals.c (match_rule_matches): add special cases for the bus driver, so you can match on sender/destination for it. * dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if DBUS_PRINT_BACKTRACE is set * dbus/dbus-internals.c: add pid to assertion failure messages * dbus/dbus-connection.c: add message type code to the debug spew * glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want sender=foo not service=foo * dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use DBUS_ACTIVATION_ADDRESS instead * bus/activation.c: set DBUS_SESSION_BUS_ADDRESS, DBUS_SYSTEM_BUS_ADDRESS if appropriate * bus/bus.c (bus_context_new): handle OOM copying bus type into context struct * dbus/dbus-message.c (dbus_message_iter_get_object_path): new function (dbus_message_iter_get_object_path_array): new function (half finished, disabled for the moment) * glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle DBUS_MESSAGE_TYPE_ERROR * tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to avoid redirecting stderr to /dev/null (babysit): close stdin if not doing the "exit_with_session" thing * dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not stdout/stdin, so things don't get confused * bus/system.conf.in: fix to allow replies, I modified .conf instead of .conf.in again. --- test/glib/run-test.sh | 10 ++++- test/glib/test-dbus-glib.c | 94 +++++++++++++++++++++++++++++++++++++++++++++- test/test-service.c | 13 ++++--- 3 files changed, 108 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh index ccbb9a4a..a51396bb 100755 --- a/test/glib/run-test.sh +++ b/test/glib/run-test.sh @@ -4,6 +4,9 @@ SCRIPTNAME=$0 function die() { + if ! test -z "$DBUS_SESSION_BUS_PID" ; then + kill -9 $DBUS_SESSION_BUS_PID + fi echo $SCRIPTNAME: $* >&2 exit 1 } @@ -13,11 +16,14 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then fi CONFIG_FILE=./run-test.conf +SERVICE_DIR="$DBUS_TOP_BUILDDIR/test/data/valid-service-files" +ESCAPED_SERVICE_DIR=`echo $SERVICE_DIR | sed -e 's/\//\\\\\\//g'` +echo "escaped service dir is: $ESCAPED_SERVICE_DIR" ## create a configuration file based on the standard session.conf cat $DBUS_TOP_BUILDDIR/bus/session.conf | \ - sed -e 's/.*$//g' | \ - sed -e 's/.*$/'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ + sed -e 's/ $CONFIG_FILE echo "Created configuration file $CONFIG_FILE" diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c index c302b239..fb8be4cc 100644 --- a/test/glib/test-dbus-glib.c +++ b/test/glib/test-dbus-glib.c @@ -11,11 +11,14 @@ main (int argc, char **argv) GMainLoop *loop; GError *error; DBusGProxy *driver; + DBusGProxy *proxy; DBusPendingCall *call; char **service_list; int service_list_len; int i; - + dbus_uint32_t result; + char *str; + g_type_init (); loop = g_main_loop_new (NULL, FALSE); @@ -66,7 +69,96 @@ main (int argc, char **argv) dbus_free_string_array (service_list); + /* Test handling of unknown method */ + call = dbus_gproxy_begin_call (driver, "ThisMethodDoesNotExist", + DBUS_TYPE_STRING, + "blah blah blah blah blah", + DBUS_TYPE_INT32, + 10, + DBUS_TYPE_INVALID); + + error = NULL; + if (dbus_gproxy_end_call (driver, call, &error, + DBUS_TYPE_INVALID)) + { + g_printerr ("Calling nonexistent method succeeded!\n"); + exit (1); + } + + g_print ("Got EXPECTED error from calling unknown method: %s\n", + error->message); + g_error_free (error); + + /* Activate a service */ + call = dbus_gproxy_begin_call (driver, "ActivateService", + DBUS_TYPE_STRING, + "org.freedesktop.DBus.TestSuiteEchoService", + DBUS_TYPE_UINT32, + 0, + DBUS_TYPE_INVALID); + + error = NULL; + if (!dbus_gproxy_end_call (driver, call, &error, + DBUS_TYPE_UINT32, &result, + DBUS_TYPE_INVALID)) + { + g_printerr ("Failed to complete Activate call: %s\n", + error->message); + g_error_free (error); + exit (1); + } + + g_print ("Activation of echo service = 0x%x\n", result); + + /* Activate a service again */ + call = dbus_gproxy_begin_call (driver, "ActivateService", + DBUS_TYPE_STRING, + "org.freedesktop.DBus.TestSuiteEchoService", + DBUS_TYPE_UINT32, + 0, + DBUS_TYPE_INVALID); + + error = NULL; + if (!dbus_gproxy_end_call (driver, call, &error, + DBUS_TYPE_UINT32, &result, + DBUS_TYPE_INVALID)) + { + g_printerr ("Failed to complete Activate call: %s\n", + error->message); + g_error_free (error); + exit (1); + } + + g_print ("Duplicate activation of echo service = 0x%x\n", result); + + /* Talk to the new service */ + + proxy = dbus_gproxy_new_for_service (connection, + "org.freedesktop.DBus.TestSuiteEchoService", + "/fixme/the/test/service/ignores/this", /* FIXME */ + "org.freedesktop.TestSuite"); + + call = dbus_gproxy_begin_call (proxy, "Echo", + DBUS_TYPE_STRING, + "my string hello", + DBUS_TYPE_INVALID); + + error = NULL; + if (!dbus_gproxy_end_call (proxy, call, &error, + DBUS_TYPE_STRING, &str, + DBUS_TYPE_INVALID)) + { + g_printerr ("Failed to complete Echo call: %s\n", + error->message); + g_error_free (error); + exit (1); + } + + g_print ("String echoed = \"%s\"\n", str); + dbus_free (str); + g_object_unref (G_OBJECT (driver)); + g_object_unref (G_OBJECT (proxy)); g_print ("Successfully completed %s\n", argv[0]); diff --git a/test/test-service.c b/test/test-service.c index d07575e2..c72a43af 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -27,7 +27,6 @@ handle_echo (DBusConnection *connection, { DBusError error; DBusMessage *reply; - DBusMessageIter iter; char *s; dbus_error_init (&error); @@ -55,20 +54,22 @@ handle_echo (DBusConnection *connection, reply = dbus_message_new_method_return (message); if (reply == NULL) die ("No memory\n"); - - dbus_message_append_iter_init (message, &iter); - if (!dbus_message_iter_append_string (&iter, s)) + if (!dbus_message_append_args (reply, + DBUS_TYPE_STRING, s, + DBUS_TYPE_INVALID)) die ("No memory"); - + if (!dbus_connection_send (connection, reply, NULL)) die ("No memory\n"); + + fprintf (stderr, "Echo service echoed string: \"%s\"\n", s); dbus_free (s); dbus_message_unref (reply); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + return DBUS_HANDLER_RESULT_HANDLED; } static DBusHandlerResult -- cgit