*
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
+ * Copyright (C) 2013 Samsung Electronics
*
* Licensed under the Academic Free License version 2.1
*
#include "dbus-internals.h"
#include "dbus-message.h"
#include "dbus-marshal-validate.h"
+#include "dbus-misc.h"
#include "dbus-threads-internal.h"
#include "dbus-connection-internal.h"
#include "dbus-string.h"
+#ifdef ENABLE_KDBUS_TRANSPORT
#include "dbus-transport-kdbus.h"
-
+#include <stdlib.h>
+#include <limits.h>
+#include <stdio.h>
+#endif
/**
* @defgroup DBusBus Message bus APIs
}
}
+#ifdef ENABLE_KDBUS_TRANSPORT
+void dbus_bus_set_bus_connection_address(DBusBusType address_type, char* address)
+{
+ if(bus_connection_addresses[address_type] != NULL)
+ free(bus_connection_addresses[address_type]);
+ bus_connection_addresses[address_type] = address;
+}
+#endif
+
static dbus_bool_t
init_session_address (void)
{
* the above code will work right
*/
- if (!_dbus_setenv ("DBUS_ACTIVATION_ADDRESS", NULL))
+ if (!dbus_setenv ("DBUS_ACTIVATION_ADDRESS", NULL))
return FALSE;
- if (!_dbus_setenv ("DBUS_ACTIVATION_BUS_TYPE", NULL))
+ if (!dbus_setenv ("DBUS_ACTIVATION_BUS_TYPE", NULL))
return FALSE;
if (!_dbus_register_shutdown_func (addresses_shutdown_func,
goto out;
}
- _dbus_verbose (" !!! dbus_connection_open finished successfully !!!! \n"); //todo RP to be removed
-
if (!dbus_bus_register (connection, error))
{
_dbus_connection_close_possibly_shared (connection);
*
* @param type bus type
* @param error address where an error can be returned.
- * @returns a #DBusConnection with new ref
+ * @returns a #DBusConnection with new ref or #NULL on error
*/
DBusConnection *
dbus_bus_get (DBusBusType type,
return internal_bus_get (type, TRUE, error);
}
-/* kdbus add-on [RP] - bus register for kdbus
- * Function checks if the method is kdbus. If yes - it registers on the bus, if no - does nothing and returns TRUE
- * Must be invoked before dbus_bus_register because in kdbus it's realized in different manner
- * and dbus_bus_register can not be used for that.
- * It does not collide with dbus_bus_register because dbus_bus_register at the beginning checks
- * whether unique_name has already been assigned and doesn't try to do it again.
- */
-dbus_bool_t dbus_bus_register_kdbus(DBusAddressEntry *entry, DBusConnection *connection, DBusError *error)
-{
- dbus_bool_t retval = TRUE;
- const char *method;
-
- method = dbus_address_entry_get_method (entry);
- _dbus_assert (method != NULL);
-
- if (strcmp (method, "kdbus") == 0)
- {
- BusData *bd;
-
- _dbus_return_val_if_fail (connection != NULL, FALSE);
- _dbus_return_val_if_error_is_set (error, FALSE);
-
- retval = FALSE;
-
- if (!_DBUS_LOCK (bus_datas))
- {
- _DBUS_SET_OOM (error);
- /* do not "goto out", that would try to unlock */
- return FALSE;
- }
-
- bd = ensure_bus_data (connection);
- if (bd == NULL)
- {
- _DBUS_SET_OOM (error);
- goto out;
- }
-
- if (bd->unique_name != NULL)
- {
- _dbus_verbose ("Ignoring attempt to register the same DBusConnection %s with the kdbus message bus a second time.\n",
- bd->unique_name);
- /* Success! */
- retval = TRUE;
- goto out;
- }
-
- if(!bus_register_kdbus(&bd->unique_name, connection, error))
- goto out;
-
-// if(!bus_register_kdbus_policy(bd->unique_name, connection, error)) //todo should it be here?
-// goto out;
-
- retval = TRUE;
-
- out:
- _DBUS_UNLOCK (bus_datas);
-
- if (!retval)
- _DBUS_ASSERT_ERROR_IS_SET (error);
- }
- return retval;
-}
-
/**
* Registers a connection with the bus. This must be the first
* thing an application does when connecting to the message bus.
DBusError *error)
{
DBusMessage *message, *reply;
- char name[18];
+ char *name = NULL;
BusData *bd;
dbus_bool_t retval;
retval = TRUE;
goto out;
}
-
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS,
- "Hello");
-
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
+ "Hello");
if (!message)
- {
- _DBUS_SET_OOM (error);
- goto out;
- }
-
+ {
+ _DBUS_SET_OOM (error);
+ goto out;
+ }
+
reply = dbus_connection_send_with_reply_and_block (connection, message, -1, error);
if (reply == NULL)
- goto out;
+ goto out;
else if (dbus_set_error_from_message (error, reply))
- goto out;
+ goto out;
else if (!dbus_message_get_args (reply, error,
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID))
- goto out;
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID))
+ goto out;
bd->unique_name = _dbus_strdup (name);
+
if (bd->unique_name == NULL)
{
_DBUS_SET_OOM (error);
goto out;
}
-
+
retval = TRUE;
out:
DBusError *error)
{
dbus_uint32_t result;
+ DBusMessage *message, *reply;
_dbus_return_val_if_fail (connection != NULL, 0);
_dbus_return_val_if_fail (name != NULL, 0);
_dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), 0);
_dbus_return_val_if_error_is_set (error, 0);
- if(!dbus_transport_is_kdbus(connection))
- {
- DBusMessage *message, *reply;
-
- message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+ message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"RequestName");
- if (message == NULL)
- {
- _DBUS_SET_OOM (error);
- return -1;
- }
+ if (message == NULL)
+ {
+ _DBUS_SET_OOM (error);
+ return -1;
+ }
- if (!dbus_message_append_args (message,
+ if (!dbus_message_append_args (message,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_UINT32, &flags,
DBUS_TYPE_INVALID))
- {
- dbus_message_unref (message);
- _DBUS_SET_OOM (error);
- return -1;
- }
+ {
+ dbus_message_unref (message);
+ _DBUS_SET_OOM (error);
+ return -1;
+ }
- reply = dbus_connection_send_with_reply_and_block (connection, message, -1,
+ reply = dbus_connection_send_with_reply_and_block (connection, message, -1,
error);
- dbus_message_unref (message);
+ dbus_message_unref (message);
- if (reply == NULL)
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- return -1;
- }
+ if (reply == NULL)
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ return -1;
+ }
- if (dbus_set_error_from_message (error, reply))
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- dbus_message_unref (reply);
- return -1;
- }
+ if (dbus_set_error_from_message (error, reply))
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ dbus_message_unref (reply);
+ return -1;
+ }
- if (!dbus_message_get_args (reply, error,
+ if (!dbus_message_get_args (reply, error,
DBUS_TYPE_UINT32, &result,
DBUS_TYPE_INVALID))
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- dbus_message_unref (reply);
- return -1;
- }
-
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
dbus_message_unref (reply);
+ return -1;
}
- else
- {
- if(!bus_register_kdbus_policy(name, connection, error)) //todo check what to do with policy if program doesn't use dbus_bus_request_name
- return -1;
- result = bus_request_name_kdbus(connection, name, flags, error);
- if(dbus_error_is_set(error))
- return -1;
- }
-
+ dbus_message_unref (reply);
return result;
}
const char *rule,
DBusError *error)
{
- _dbus_return_if_fail (rule != NULL);
+ DBusMessage *msg;
- if(!dbus_transport_is_kdbus(connection))
- {
- DBusMessage *msg;
+ _dbus_return_if_fail (rule != NULL);
- msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+ msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"AddMatch");
- if (msg == NULL)
- {
- _DBUS_SET_OOM (error);
- return;
- }
+ if (msg == NULL)
+ {
+ _DBUS_SET_OOM (error);
+ return;
+ }
- if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule,
+ if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule,
DBUS_TYPE_INVALID))
- {
- dbus_message_unref (msg);
- _DBUS_SET_OOM (error);
- return;
- }
+ {
+ dbus_message_unref (msg);
+ _DBUS_SET_OOM (error);
+ return;
+ }
- send_no_return_values (connection, msg, error);
+ send_no_return_values (connection, msg, error);
- dbus_message_unref (msg);
- }
- else
- dbus_bus_add_match_kdbus(connection, rule, error);
+ dbus_message_unref (msg);
}
/**
const char *rule,
DBusError *error)
{
- DBusMessage *msg;
+ DBusMessage *msg;
- _dbus_return_if_fail (rule != NULL);
-
- msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS,
- "RemoveMatch");
+ _dbus_return_if_fail (rule != NULL);
- if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule,
- DBUS_TYPE_INVALID))
- {
- dbus_message_unref (msg);
- _DBUS_SET_OOM (error);
- return;
- }
+ msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
+ "RemoveMatch");
- send_no_return_values (connection, msg, error);
+ if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule,
+ DBUS_TYPE_INVALID))
+ {
+ dbus_message_unref (msg);
+ _DBUS_SET_OOM (error);
+ return;
+ }
- dbus_message_unref (msg);
+ send_no_return_values (connection, msg, error);
+
+ dbus_message_unref (msg);
}
/** @} */
projects / platform / upstream / dbus.git / blobdiff