#include "gsimpleasyncresult.h"
#ifdef G_OS_UNIX
+#include "gkdbus.h"
+#include "gkdbusconnection.h"
#include "gunixconnection.h"
#include "gunixfdmessage.h"
#endif
/* ---------------------------------------------------------------------------------------------------- */
/**
+ * g_dbus_request_name:
+ * @connection: a #GDBusConnection
+ * @name: well-known bus name (name to request)
+ * @flags: a set of flags from the GBusNameOwnerFlags enumeration
+ * @error: return location for error or %NULL
+ *
+ * Synchronously acquires name on the bus and returns status code.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * Returns: status code or %G_BUS_REQUEST_NAME_FLAGS_ERROR
+ * if @error is set.
+ *
+ * Since: 2.4x
+ */
+GBusRequestNameReplyFlags
+g_dbus_request_name (GDBusConnection *connection,
+ const gchar *name,
+ GBusNameOwnerFlags flags,
+ GError **error)
+{
+ GVariant *result;
+ guint32 request_name_reply;
+
+ g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), G_BUS_RELEASE_NAME_FLAGS_ERROR);
+ g_return_val_if_fail (g_dbus_is_name (name) && !g_dbus_is_unique_name (name), G_BUS_RELEASE_NAME_FLAGS_ERROR);
+ g_return_val_if_fail (error == NULL || *error == NULL, G_BUS_RELEASE_NAME_FLAGS_ERROR);
+
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_RequestName (connection, name, flags, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/org/freedesktop/DBus",
+ "org.freedesktop.DBus", "RequestName",
+ g_variant_new ("(su)", name, flags), G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+
+ if (result != NULL)
+ {
+ g_variant_get (result, "(u)", &request_name_reply);
+ g_variant_unref (result);
+ }
+ else
+ request_name_reply = G_BUS_REQUEST_NAME_FLAGS_ERROR;
+
+ return (GBusRequestNameReplyFlags) request_name_reply;
+}
+
+/**
+ * g_dbus_release_name:
+ * @connection: a #GDBusConnection
+ * @name: well-known bus name (name to release)
+ * @error: return location for error or %NULL
+ *
+ * Synchronously releases name on the bus and returns status code.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * Returns: status code or %G_BUS_RELEASE_NAME_FLAGS_ERROR
+ * if @error is set.
+ *
+ * Since: 2.4x
+ */
+GBusReleaseNameReplyFlags
+g_dbus_release_name (GDBusConnection *connection,
+ const gchar *name,
+ GError **error)
+{
+ GVariant *result;
+ guint32 release_name_reply;
+
+ g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), G_BUS_RELEASE_NAME_FLAGS_ERROR);
+ g_return_val_if_fail (g_dbus_is_name (name) && !g_dbus_is_unique_name (name), G_BUS_RELEASE_NAME_FLAGS_ERROR);
+ g_return_val_if_fail (error == NULL || *error == NULL, G_BUS_RELEASE_NAME_FLAGS_ERROR);
+
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_ReleaseName (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/org/freedesktop/DBus",
+ "org.freedesktop.DBus", "ReleaseName",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+
+ if (result != NULL)
+ {
+ g_variant_get (result, "(u)", &release_name_reply);
+ g_variant_unref (result);
+ }
+ else
+ release_name_reply = G_BUS_RELEASE_NAME_FLAGS_ERROR;
+
+ return (GBusReleaseNameReplyFlags) release_name_reply;
+}
+
+/**
* g_dbus_get_bus_id:
* @connection: a #GDBusConnection
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns the unique ID of the bus.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED.
- *
* The calling thread is blocked until a reply is received.
*
* Returns: the unique ID of the bus or %NULL if @error is set.
*/
gchar *
g_dbus_get_bus_id (GDBusConnection *connection,
- gint timeout_msec,
GError **error)
{
GVariant *result;
gchar *bus_id;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
result = NULL;
bus_id = NULL;
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "GetId",
- NULL, G_VARIANT_TYPE ("(s)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ {
+ result = _g_kdbus_GetBusId (connection, error);
+ }
+ else
+ {
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "GetId",
+ NULL, G_VARIANT_TYPE ("(s)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ }
+
if (result != NULL)
{
g_variant_get (result, "(s)", &bus_id);
_g_dbus_get_list_internal (GDBusConnection *connection,
const gchar *name,
GDBusListNameType list_name_type,
- gint timeout_msec,
GError **error)
{
gchar **strv;
if (list_name_type == LIST_QUEUED_OWNERS)
{
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "ListQueuedOwners",
- g_variant_new ("(s)", name), G_VARIANT_TYPE ("(as)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_GetListQueuedOwners (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "ListQueuedOwners",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(as)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
}
else
{
else
method_name = "ListActivatableNames";
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", method_name,
- NULL, G_VARIANT_TYPE ("(as)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_GetListNames (connection, list_name_type, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", method_name,
+ NULL, G_VARIANT_TYPE ("(as)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
}
if (result != NULL)
/**
* g_dbus_get_list_names:
* @connection: a #GDBusConnection
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns a list of all currently-owned names on the bus.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED.
- *
* The calling thread is blocked until a reply is received.
*
- * Returns: a list of all currently-owned names on the bus.
- * Free with g_strfreev().
+ * Returns: a list of all currently-owned names on the bus or %NULL if
+ * @error is set. Free with g_strfreev().
*
* Since: 2.4x
*/
gchar **
g_dbus_get_list_names (GDBusConnection *connection,
- gint timeout_msec,
GError **error)
{
gchar **strv;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- strv = _g_dbus_get_list_internal (connection, NULL, LIST_NAMES, timeout_msec, error);
+ strv = _g_dbus_get_list_internal (connection, NULL, LIST_NAMES, error);
return strv;
}
/**
* g_dbus_get_list_activatable_names:
* @connection: a #GDBusConnection
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns a list of all names that can be activated on the bus.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED.
- *
* The calling thread is blocked until a reply is received.
*
- * Returns: a list of all names that can be activated on the bus.
- * Free with g_strfreev().
+ * Returns: a list of all names that can be activated on the bus or %NULL if
+ * @error is set. Free with g_strfreev().
*
* Since: 2.4x
*/
gchar **
g_dbus_get_list_activatable_names (GDBusConnection *connection,
- gint timeout_msec,
GError **error)
{
gchar **strv;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- strv = _g_dbus_get_list_internal (connection, NULL, LIST_ACTIVATABLE_NAMES, timeout_msec, error);
+ strv = _g_dbus_get_list_internal (connection, NULL, LIST_ACTIVATABLE_NAMES, error);
return strv;
}
* g_dbus_get_list_queued_names:
* @connection: a #GDBusConnection
* @name: a unique or well-known bus name
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns the unique bus names of connections currently queued
* for the @name.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED. If @name contains a value not compatible with
- * the D-Bus syntax and naming conventions for bus names, the operation
- * returns %NULL.
+ * If @name contains a value not compatible with the D-Bus syntax and naming
+ * conventions for bus names, the operation returns %NULL and @error is set.
*
* The calling thread is blocked until a reply is received.
*
gchar **
g_dbus_get_list_queued_owners (GDBusConnection *connection,
const gchar *name,
- gint timeout_msec,
GError **error)
{
gchar **strv;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (name == NULL || g_dbus_is_name (name), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- strv = _g_dbus_get_list_internal (connection, name, LIST_QUEUED_OWNERS, timeout_msec, error);
+ strv = _g_dbus_get_list_internal (connection, name, LIST_QUEUED_OWNERS, error);
return strv;
}
* g_dbus_get_name_owner:
* @connection: a #GDBusConnection
* @name: well-known bus name to get the owner of
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns the unique connection name of the primary owner of
* the name given. If the requested name doesn't have an owner, an @error is
* returned.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED. If @name contains a value not compatible with
- * the D-Bus syntax and naming conventions for bus names, the operation
- * returns %NULL.
+ * If @name contains a value not compatible with the D-Bus syntax and naming
+ * conventions for bus names, the operation returns %NULL and @error is set.
*
* The calling thread is blocked until a reply is received.
*
gchar *
g_dbus_get_name_owner (GDBusConnection *connection,
const gchar *name,
- gint timeout_msec,
GError **error)
{
GVariant *result;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (name == NULL || g_dbus_is_name (name), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
name_owner = NULL;
result = NULL;
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "GetNameOwner",
- g_variant_new ("(s)", name), G_VARIANT_TYPE ("(s)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_GetNameOwner (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "GetNameOwner",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(s)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
if (result != NULL)
{
g_variant_get (result, "(s)", &name_owner);
* g_dbus_name_has_owner:
* @connection: a #GDBusConnection
* @name: a unique or well-known bus name
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously checks if the specified name exists (currently has an owner).
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED. If @name contains a value not compatible with
- * the D-Bus syntax and naming conventions for bus names, the operation
- * returns FALSE.
+ * If @name contains a value not compatible with the D-Bus syntax and naming
+ * conventions for bus names, the operation returns %NULL and @error is set.
*
* The calling thread is blocked until a reply is received.
*
gboolean
g_dbus_name_has_owner (GDBusConnection *connection,
const gchar *name,
- gint timeout_msec,
GError **error)
{
GVariant *result;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (name == NULL || g_dbus_is_name (name), NULL);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
result = NULL;
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "NameHasOwner",
- g_variant_new ("(s)", name), G_VARIANT_TYPE ("(b)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_NameHasOwner (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "NameHasOwner",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(b)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
if (result != NULL)
{
g_variant_get (result, "(b)", &ret);
* g_dbus_get_connection_pid:
* @connection: a #GDBusConnection
* @name: a unique or well-known bus name of the connection to query
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns the Unix process ID of the process connected to the
* bus. If unable to determine it, an @error is returned.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED. If @name contains a value not compatible with
- * the D-Bus syntax and naming conventions for bus names, the operation
- * returns (guint32) -1.
+ * If @name contains a value not compatible with the D-Bus syntax and naming
+ * conventions for bus names, the operation returns (guint32) -1 and @error
+ * is set.
*
* The calling thread is blocked until a reply is received.
*
guint32
g_dbus_get_connection_pid (GDBusConnection *connection,
const gchar *name,
- gint timeout_msec,
GError **error)
{
GVariant *result;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), -1);
g_return_val_if_fail (name == NULL || g_dbus_is_name (name), -1);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, -1);
g_return_val_if_fail (error == NULL || *error == NULL, -1);
result = NULL;
pid = -1;
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "GetConnectionUnixProcessID",
- g_variant_new ("(s)", name), G_VARIANT_TYPE ("(u)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_GetConnectionUnixProcessID (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "GetConnectionUnixProcessID",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
if (result != NULL)
{
g_variant_get (result, "(u)", &pid);
* g_dbus_get_connection_uid:
* @connection: a #GDBusConnection
* @name: a unique or well-known bus name of the connection to query
- * @timeout_msec: the timeout in milliseconds, -1 to use the default timeout
* @error: return location for error or %NULL
*
* Synchronously returns the Unix user ID of the process connected to the
* bus. If unable to determine it, an @error is returned.
*
- * If @connection is closed then the operation will fail with
- * %G_IO_ERROR_CLOSED. If @name contains a value not compatible with
- * the D-Bus syntax and naming conventions for bus names, the operation
- * returns (guint32) -1.
+ * If @name contains a value not compatible with the D-Bus syntax and naming
+ * conventions for bus names, the operation returns (guint32) -1 and @error
+ * is set.
*
* The calling thread is blocked until a reply is received.
*
guint32
g_dbus_get_connection_uid (GDBusConnection *connection,
const gchar *name,
- gint timeout_msec,
GError **error)
{
GVariant *result;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), -1);
g_return_val_if_fail (name == NULL || g_dbus_is_name (name), -1);
- g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, -1);
g_return_val_if_fail (error == NULL || *error == NULL, -1);
result = NULL;
uid = -1;
- result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
- "org.freedesktop.DBus", "GetConnectionUnixUser",
- g_variant_new ("(s)", name), G_VARIANT_TYPE ("(u)"),
- G_DBUS_CALL_FLAGS_NONE, timeout_msec, NULL, error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ result = _g_kdbus_GetConnectionUnixUser (connection, name, error);
+ else
+ result = g_dbus_connection_call_sync (connection, "org.freedesktop.DBus", "/",
+ "org.freedesktop.DBus", "GetConnectionUnixUser",
+ g_variant_new ("(s)", name), G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
if (result != NULL)
{
g_variant_get (result, "(u)", &uid);
g_assert_not_reached ();
}
+ /* [KDBUS] Skip authentication process for kdbus transport */
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ {
+ goto authenticated;
+ }
+
/* Authenticate the connection */
if (connection->flags & G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER)
{
connection->authentication_observer = NULL;
}
+authenticated:
+
//g_output_stream_flush (G_SOCKET_CONNECTION (connection->stream)
//g_debug ("haz unix fd passing powers: %d", connection->capabilities & G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING);
goto out;
}
- hello_result = g_dbus_connection_call_sync (connection,
- "org.freedesktop.DBus", /* name */
- "/org/freedesktop/DBus", /* path */
- "org.freedesktop.DBus", /* interface */
- "Hello",
- NULL, /* parameters */
- G_VARIANT_TYPE ("(s)"),
- CALL_FLAGS_INITIALIZING,
- -1,
- NULL, /* TODO: cancellable */
- &connection->initialization_error);
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ {
+ hello_result = _g_kdbus_Hello (connection->stream, &connection->initialization_error);
+ }
+ else
+ {
+ hello_result = g_dbus_connection_call_sync (connection,
+ "org.freedesktop.DBus", /* name */
+ "/org/freedesktop/DBus", /* path */
+ "org.freedesktop.DBus", /* interface */
+ "Hello",
+ NULL, /* parameters */
+ G_VARIANT_TYPE ("(s)"),
+ CALL_FLAGS_INITIALIZING,
+ -1,
+ NULL, /* TODO: cancellable */
+ &connection->initialization_error);
+ }
+
if (hello_result == NULL)
goto out;
{
if (!is_signal_data_for_name_lost_or_acquired (signal_data))
add_match_rule (connection, signal_data->rule);
+ else
+ {
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ {
+ if (g_strcmp0 (signal_data->member, "NameAcquired") == 0)
+ _g_kdbus_subscribe_name_acquired (connection, arg0);
+ else if (g_strcmp0 (signal_data->member, "NameLost") == 0)
+ _g_kdbus_subscribe_name_lost (connection, arg0);
+ }
+ }
}
signal_data_array = g_hash_table_lookup (connection->map_sender_unique_name_to_signal_data_array,
*/
remove_match_rule (connection, signal_data->rule);
}
+ else
+ {
+ if (G_IS_KDBUS_CONNECTION (connection->stream))
+ {
+ //_g_kdbus_unsubscribe_name_lost_and_acquired (connection, arg0);
+ }
+ }
signal_data_free (signal_data);
}
}
else
{
- g_variant_ref_sink (parameters);
+ g_variant_ref (parameters);
}
#if 0
projects / platform / upstream / glib.git / blobdiff