korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 00:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

obexd: Synchronization sessions return transfers

Browse Source 
Return the D-Bus path of the transfer representing the operation.
This commit is contained in:
Mikel Astiz 2012-06-04 11:37:52 +02:00 committed by Marcel Holtmann
parent d6f045dc5c
commit 0a174f40c6
1 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
obexd/client/sync.c
View File

@ -84,53 +84,22 @@ static DBusMessage *sync_setlocation(DBusConnection *connection,
return dbus_message_new_method_return(message);
}
static void sync_getphonebook_callback(struct obc_session *session,
struct obc_transfer *transfer,
GError *err, void *user_data)
{
struct sync_data *sync = user_data;
DBusMessage *reply;
char *contents;
size_t size;
int perr;
if (err) {
reply = g_dbus_create_error(sync->msg,
"org.openobex.Error.Failed",
"%s", err->message);
goto send;
}
perr = obc_transfer_get_contents(transfer, &contents, &size);
if (perr < 0) {
reply = g_dbus_create_error(sync->msg,
"org.openobex.Error.Failed",
"Error reading contents: %s",
strerror(-perr));
goto send;
}
reply = dbus_message_new_method_return(sync->msg);
dbus_message_append_args(reply, DBUS_TYPE_STRING, &contents,
DBUS_TYPE_INVALID);
g_free(contents);
send:
g_dbus_send_message(conn, reply);
dbus_message_unref(sync->msg);
sync->msg = NULL;
}
static DBusMessage *sync_getphonebook(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
struct sync_data *sync = user_data;
struct obc_transfer *transfer;
const char *target_file;
GError *err = NULL;
DBusMessage *reply;
if (dbus_message_get_args(message, NULL,
DBUS_TYPE_STRING, &target_file,
DBUS_TYPE_INVALID) == FALSE)
return g_dbus_create_error(message,
ERROR_INF ".InvalidArguments",
"Invalid arguments in method call");
if (sync->msg)
return g_dbus_create_error(message,
ERROR_INF ".InProgress", "Transfer in progress");
@ -139,17 +108,15 @@ static DBusMessage *sync_getphonebook(DBusConnection *connection,
if (!sync->phonebook_path)
sync->phonebook_path = g_strdup("telecom/pb.vcf");
transfer = obc_transfer_get("phonebook", sync->phonebook_path, NULL,
&err);
transfer = obc_transfer_get("phonebook", sync->phonebook_path,
target_file, &err);
if (transfer == NULL)
goto fail;
if (obc_session_queue(sync->session, transfer,
sync_getphonebook_callback,
sync, &err)) {
sync->msg = dbus_message_ref(message);
return NULL;
}
if (!obc_session_queue(sync->session, transfer, NULL, NULL, &err))
goto fail;
return obc_transfer_create_dbus_reply(transfer, message);
fail:
reply = g_dbus_create_error(message, ERROR_INF ".Failed", "%s",
@ -163,27 +130,30 @@ static DBusMessage *sync_putphonebook(DBusConnection *connection,
{
struct sync_data *sync = user_data;
struct obc_transfer *transfer;
const char *buf;
const char *source_file;
GError *err = NULL;
DBusMessage *reply;
if (dbus_message_get_args(message, NULL,
DBUS_TYPE_STRING, &buf,
DBUS_TYPE_INVALID) == FALSE)
DBUS_TYPE_STRING, &source_file,
DBUS_TYPE_INVALID) == FALSE)
return g_dbus_create_error(message,
ERROR_INF ".InvalidArguments", NULL);
ERROR_INF ".InvalidArguments",
"Invalid arguments in method call");
/* set default phonebook_path to memory internal phonebook */
if (!sync->phonebook_path)
sync->phonebook_path = g_strdup("telecom/pb.vcf");
transfer = obc_transfer_put(NULL, sync->phonebook_path, NULL, buf,
strlen(buf), &err);
transfer = obc_transfer_put(NULL, sync->phonebook_path, source_file,
NULL, 0, &err);
if (transfer == NULL)
goto fail;
if (obc_session_queue(sync->session, transfer, NULL, NULL, &err))
return dbus_message_new_method_return(message);
if (!obc_session_queue(sync->session, transfer, NULL, NULL, &err))
goto fail;
return obc_transfer_create_dbus_reply(transfer, message);
fail:
reply = g_dbus_create_error(message, ERROR_INF ".Failed", "%s",
@ -196,11 +166,15 @@ static const GDBusMethodTable sync_methods[] = {
{ GDBUS_METHOD("SetLocation",
GDBUS_ARGS({ "location", "s" }), NULL,
sync_setlocation) },
{ GDBUS_ASYNC_METHOD("GetPhonebook",
NULL, GDBUS_ARGS({ "obj", "s" }),
{ GDBUS_METHOD("GetPhonebook",
GDBUS_ARGS({ "targetfile", "s" }),
GDBUS_ARGS({ "transfer", "o" },
{ "properties", "a{sv}" }),
sync_getphonebook) },
{ GDBUS_ASYNC_METHOD("PutPhonebook",
GDBUS_ARGS({ "obj", "s" }), NULL,
{ GDBUS_METHOD("PutPhonebook",
GDBUS_ARGS({ "sourcefile", "s" }),
GDBUS_ARGS({ "transfer", "o" },
{ "properties", "a{sv}" }),
sync_putphonebook) },
{ }
};