mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-03 08:58:08 +02:00
Mega-patch that gets the message bus daemon initially handling out-of-memory. Work still needed. Also lots of random moving stuff to DBusError instead of ResultCode. * dbus/dbus-list.c (_dbus_list_length_is_one): new function * dbus/dbus-connection.c (dbus_connection_send_with_reply_and_block): use DBusError * dbus/dbus-bus.c: adapt to API changes, make it use DBusError not DBusResultCode * dbus/dbus-connection.c (dbus_connection_send): drop the result code here, as the only failure possible is OOM. * bus/connection.c (bus_connection_disconnect): rename bus_connection_disconnected as it's a notification only * bus/driver.c (bus_driver_handle_acquire_service): don't free "name" on get_args failure, should be done by get_args; don't disconnect client for bad args, just return an error. (bus_driver_handle_service_exists): ditto * bus/services.c (bus_services_list): NULL-terminate returned array * bus/driver.c (bus_driver_send_service_lost) (bus_driver_send_service_acquired): send messages from driver to a specific client to the client's unique name, not to the broadcast service. * dbus/dbus-message.c (decode_header_data): reject messages that contain no name field (_dbus_message_get_client_serial): rename to dbus_message_get_serial and make public (_dbus_message_set_serial): rename from set_client_serial (_dbus_message_set_reply_serial): make public (_dbus_message_get_reply_serial): make public * bus/connection.c (bus_connection_foreach): allow stopping iteration by returning FALSE from foreach function. * dbus/dbus-connection.c (dbus_connection_send_preallocated) (dbus_connection_free_preallocated_send) (dbus_connection_preallocate_send): new API for sending a message without possibility of malloc failure. (dbus_connection_send_message): rename to just dbus_connection_send (and same for whole function family) * dbus/dbus-errors.c (dbus_error_free): make this reinit the error * dbus/dbus-sysdeps.c (_dbus_exit): new function * bus/activation.c: handle/return errors * dbus/dbus-errors.h: add more DBUS_ERROR #define * dbus/dbus-sysdeps.c (_dbus_directory_open) (_dbus_file_get_contents) (_dbus_directory_get_next_file): use DBusError instead of DBusResultCode (_dbus_result_from_errno): move to this file
250 lines
6.9 KiB
C
250 lines
6.9 KiB
C
#include <dbus/dbus.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#define DBUS_COMPILATION /* cheat and use DBusList */
|
|
#include <dbus/dbus-list.h>
|
|
#include <bus/connection.h>
|
|
|
|
#undef DBUS_COMPILATION
|
|
|
|
#include "debug-thread.h"
|
|
#include "bus-test-loop.h"
|
|
|
|
|
|
static DBusHandlerResult
|
|
message_handler (DBusMessageHandler *handler,
|
|
DBusConnection *connection,
|
|
DBusMessage *message,
|
|
void *user_data)
|
|
{
|
|
printf ("client got a message!: %s\n",
|
|
dbus_message_get_name (message));
|
|
return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
|
|
}
|
|
|
|
static void
|
|
new_connection_callback (DBusServer *server,
|
|
DBusConnection *new_connection,
|
|
void *data)
|
|
{
|
|
if (!bus_connection_setup (new_connection))
|
|
return;
|
|
|
|
bus_test_loop_hookup_with_connection (new_connection);
|
|
|
|
dbus_connection_ref (new_connection);
|
|
}
|
|
|
|
|
|
static void
|
|
die (const char *failure)
|
|
{
|
|
fprintf (stderr, "Unit test failed: %s\n", failure);
|
|
exit (1);
|
|
}
|
|
|
|
/* Here are the tests */
|
|
static dbus_bool_t test_hello_succeeding = TRUE;
|
|
static char *client1_name, *client2_name;
|
|
static int client1_stage = 0, client2_stage = 0;
|
|
|
|
#define TEST_HELLO_HANDLE_FAIL(x) do { if (!(x)) { printf ("failed at line %d\n", __LINE__); test_hello_succeeding = FALSE; goto out; } } while (0)
|
|
|
|
|
|
static DBusHandlerResult
|
|
test_hello_client1_handler (DBusMessageHandler *handler,
|
|
DBusConnection *connection,
|
|
DBusMessage *message,
|
|
void *user_data)
|
|
{
|
|
char *tmp = NULL;
|
|
|
|
if (!test_hello_succeeding)
|
|
goto out;
|
|
|
|
#if 1
|
|
printf ("In stage %d got message %s\n",
|
|
client1_stage, dbus_message_get_name (message));
|
|
#endif
|
|
|
|
if (dbus_message_name_is (message, DBUS_MESSAGE_HELLO))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (client1_stage == 0);
|
|
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &client1_name,
|
|
0));
|
|
|
|
client1_stage += 1;
|
|
}
|
|
else if (dbus_message_name_is (message, DBUS_MESSAGE_SERVICE_CREATED))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &tmp,
|
|
0));
|
|
|
|
#if 0
|
|
printf ("ServiceCreated is %s\n", tmp);
|
|
#endif
|
|
|
|
TEST_HELLO_HANDLE_FAIL (client1_stage == 1 || client1_stage == 3);
|
|
|
|
if (client1_stage == 1)
|
|
TEST_HELLO_HANDLE_FAIL (strcmp (client1_name, tmp) == 0);
|
|
else
|
|
TEST_HELLO_HANDLE_FAIL (strcmp (client2_name, tmp) == 0);
|
|
|
|
client1_stage += 1;
|
|
|
|
if (client1_stage == 4)
|
|
bus_test_loop_quit ();
|
|
}
|
|
else if (dbus_message_name_is (message, DBUS_MESSAGE_SERVICE_ACQUIRED))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (client1_stage == 2);
|
|
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &tmp,
|
|
0));
|
|
TEST_HELLO_HANDLE_FAIL (strcmp (client1_name, tmp) == 0);
|
|
|
|
client1_stage += 1;
|
|
}
|
|
else
|
|
{
|
|
printf ("client1 received unexpected message %s in stage %d\n",
|
|
dbus_message_get_name (message), client1_stage);
|
|
|
|
test_hello_succeeding = FALSE;
|
|
goto out;
|
|
}
|
|
|
|
out:
|
|
if (tmp)
|
|
dbus_free (tmp);
|
|
|
|
return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
|
|
}
|
|
|
|
static DBusHandlerResult
|
|
test_hello_client2_handler (DBusMessageHandler *handler,
|
|
DBusConnection *connection,
|
|
DBusMessage *message,
|
|
void *user_data)
|
|
{
|
|
char *tmp = NULL;
|
|
|
|
if (!test_hello_succeeding)
|
|
goto out;
|
|
|
|
if (dbus_message_name_is (message, DBUS_MESSAGE_HELLO))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (client2_stage == 0);
|
|
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &client2_name,
|
|
0));
|
|
|
|
client2_stage += 1;
|
|
}
|
|
else if (dbus_message_name_is (message, DBUS_MESSAGE_SERVICE_CREATED))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (client2_stage == 1);
|
|
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &tmp,
|
|
0));
|
|
TEST_HELLO_HANDLE_FAIL (strcmp (client2_name, tmp) == 0);
|
|
|
|
client2_stage += 1;
|
|
}
|
|
else if (dbus_message_name_is (message, DBUS_MESSAGE_SERVICE_ACQUIRED))
|
|
{
|
|
TEST_HELLO_HANDLE_FAIL (client2_stage == 2);
|
|
|
|
TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL,
|
|
DBUS_TYPE_STRING, &tmp,
|
|
0));
|
|
TEST_HELLO_HANDLE_FAIL (strcmp (client2_name, tmp) == 0);
|
|
|
|
client2_stage += 1;
|
|
}
|
|
else
|
|
{
|
|
test_hello_succeeding = FALSE;
|
|
goto out;
|
|
}
|
|
|
|
out:
|
|
if (tmp)
|
|
dbus_free (tmp);
|
|
|
|
return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
|
|
}
|
|
|
|
static dbus_bool_t
|
|
test_hello_replies (void)
|
|
{
|
|
DBusConnection *connection;
|
|
DBusMessage *message;
|
|
DBusMessageHandler *handler;
|
|
DBusResultCode result;
|
|
|
|
/* First start client 1 */
|
|
connection = dbus_connection_open ("debug:name=test-server", &result);
|
|
bus_test_loop_hookup_with_connection (connection);
|
|
message = dbus_message_new (DBUS_SERVICE_DBUS,
|
|
DBUS_MESSAGE_HELLO);
|
|
handler = dbus_message_handler_new (test_hello_client1_handler, NULL, NULL);
|
|
dbus_connection_add_filter (connection, handler);
|
|
if (!dbus_connection_send (connection, message, NULL))
|
|
die ("no memory to send message");
|
|
dbus_message_unref (message);
|
|
|
|
/* Then start client 2 */
|
|
connection = dbus_connection_open ("debug:name=test-server", &result);
|
|
bus_test_loop_hookup_with_connection (connection);
|
|
message = dbus_message_new (DBUS_SERVICE_DBUS,
|
|
DBUS_MESSAGE_HELLO);
|
|
handler = dbus_message_handler_new (test_hello_client2_handler, NULL, NULL);
|
|
dbus_connection_add_filter (connection, handler);
|
|
if (!dbus_connection_send (connection, message, NULL))
|
|
die ("no memory to send message");
|
|
dbus_message_unref (message);
|
|
|
|
bus_test_loop_run ();
|
|
|
|
return test_hello_succeeding;
|
|
}
|
|
|
|
int
|
|
main (int argc,
|
|
char **argv)
|
|
{
|
|
DBusServer *server;
|
|
DBusResultCode result;
|
|
|
|
debug_threads_init ();
|
|
|
|
bus_connection_init ();
|
|
|
|
server = dbus_server_listen ("debug:name=test-server", &result);
|
|
dbus_server_set_new_connection_function (server,
|
|
new_connection_callback,
|
|
NULL, NULL);
|
|
bus_test_loop_hookup_with_server (server);
|
|
if (server == NULL)
|
|
{
|
|
fprintf (stderr, "Failed to start server: %s\n",
|
|
dbus_result_to_string (result));
|
|
return 1;
|
|
}
|
|
|
|
if (!test_hello_replies ())
|
|
die ("hello with replies");
|
|
|
|
printf ("all tests succeeded\n");
|
|
|
|
return 0;
|
|
}
|