sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Use NameHasOwner instead of ListNames for name checking

This commit is contained in:
Johan Hedberg 2009-08-08 20:21:26 +03:00 committed by Marcel Holtmann
parent 07cca7ab13
commit b8addb4af3
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gdbus/watch.c
View File

@ -309,7 +309,6 @@ static DBusHandlerResult name_exit_filter(DBusConnection *connection,
struct service_data { struct service_data {
DBusConnection *conn; DBusConnection *conn;
const char *name;
GDBusWatchFunction conn_func; GDBusWatchFunction conn_func;
void *user_data; void *user_data;
}; };
@ -319,8 +318,7 @@ static void service_reply(DBusPendingCall *call, void *user_data)
struct service_data *data = user_data; struct service_data *data = user_data;
DBusMessage *reply; DBusMessage *reply;
DBusError error; DBusError error;
char **names; dbus_bool_t has_owner;
int i, count;
reply = dbus_pending_call_steal_reply(call); reply = dbus_pending_call_steal_reply(call);
if (reply == NULL) if (reply == NULL)
@ -329,25 +327,19 @@ static void service_reply(DBusPendingCall *call, void *user_data)
dbus_error_init(&error); dbus_error_init(&error);
if (dbus_message_get_args(reply, &error, if (dbus_message_get_args(reply, &error,
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &names, &count, DBUS_TYPE_BOOLEAN, &has_owner,
DBUS_TYPE_INVALID) == FALSE) { DBUS_TYPE_INVALID) == FALSE) {
if (dbus_error_is_set(&error) == TRUE) { if (dbus_error_is_set(&error) == TRUE) {
error("%s", error.message); error("%s", error.message);
dbus_error_free(&error); dbus_error_free(&error);
} else { } else {
error("Wrong arguments for name list"); error("Wrong arguments for NameHasOwner reply");
} }
goto done; goto done;
} }
for (i = 0; i < count; i++) if (has_owner && data->conn_func)
if (g_strcmp0(names[i], data->name) == 0) { data->conn_func(data->conn, data->user_data);
if (data->conn_func)
data->conn_func(data->conn, data->user_data);
break;
}
g_strfreev(names);
done: done:
dbus_message_unref(reply); dbus_message_unref(reply);
@ -367,18 +359,20 @@ static void check_service(DBusConnection *connection, const char *name,
} }
data->conn = connection; data->conn = connection;
data->name = name;
data->conn_func = connect; data->conn_func = connect;
data->user_data = user_data; data->user_data = user_data;
message = dbus_message_new_method_call(DBUS_SERVICE_DBUS, message = dbus_message_new_method_call(DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "ListNames"); DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameHasOwner");
if (message == NULL) { if (message == NULL) {
error("Can't allocate new message"); error("Can't allocate new message");
g_free(data); g_free(data);
return; return;
} }
dbus_message_append_args(message, DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID);
if (dbus_connection_send_with_reply(connection, message, if (dbus_connection_send_with_reply(connection, message,
&call, -1) == FALSE) { &call, -1) == FALSE) {
error("Failed to execute method call"); error("Failed to execute method call");