diff --git a/doc/obex-client-api.txt b/doc/obex-client-api.txt index c292323e1..335562642 100644 --- a/doc/obex-client-api.txt +++ b/doc/obex-client-api.txt @@ -4,79 +4,6 @@ OBEX client API description Copyright (C) 2007-2010 Marcel Holtmann Copyright (C) 2011-2012 BMW Car IT GmbH. All rights reserved. -File Transfer hierarchy -======================= - -Service org.bluez.obex -Interface org.bluez.obex.FileTransfer -Object path [variable prefix]/{session0,session1,...} - -Methods void ChangeFolder(string folder) - - Change the current folder of the remote device. - - void CreateFolder(string folder) - - Create a new folder in the remote device. - - array{dict} ListFolder() - - Returns a dictionary containing information about - the current folder content. - - The following keys are defined: - - string Name : Object name in UTF-8 format - string Type : Either "folder" or "file" - uint64 Size : Object size or number of items in - folder - string Permission : Group, owner and other - permission - uint64 Modified : Last change - uint64 Accessed : Last access - uint64 Created : Creation date - - object, dict GetFile(string targetfile, string sourcefile) - - Copy the source file (from remote device) to the - target file (on local filesystem). - - If an empty target file is given, a name will be - automatically calculated for the temporary file. - - The returned path represents the newly created transfer, - which should be used to find out if the content has been - successfully transferred or if the operation fails. - - The properties of this transfer are also returned along - with the object path, to avoid a call to GetProperties. - - object, dict PutFile(string sourcefile, string targetfile) - - Copy the source file (from local filesystem) to the - target file (on remote device). - - The returned path represents the newly created transfer, - which should be used to find out if the content has been - successfully transferred or if the operation fails. - - The properties of this transfer are also returned along - with the object path, to avoid a call to GetProperties. - - void CopyFile(string sourcefile, string targetfile) - - Copy a file within the remote device from source file - to target file. - - void MoveFile(string sourcefile, string targetfile) - - Move a file within the remote device from source file - to the target file. - - void Delete(string file) - - Deletes the specified file/folder. - Phonebook Access hierarchy ======================= diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt index 3cded1ff0..a27b465b2 100644 --- a/doc/obexd-api.txt +++ b/doc/obexd-api.txt @@ -175,3 +175,76 @@ Methods object, dict SendFile(string sourcefile) The properties of this transfer are also returned along with the object path, to avoid a call to GetProperties. + +File Transfer hierarchy +======================= + +Service org.bluez.obex +Interface org.bluez.obex.FileTransfer +Object path /org/bluez/obex/session{0, 1, 2, ...} + +Methods void ChangeFolder(string folder) + + Change the current folder of the remote device. + + void CreateFolder(string folder) + + Create a new folder in the remote device. + + array{dict} ListFolder() + + Returns a dictionary containing information about + the current folder content. + + The following keys are defined: + + string Name : Object name in UTF-8 format + string Type : Either "folder" or "file" + uint64 Size : Object size or number of items in + folder + string Permission : Group, owner and other + permission + uint64 Modified : Last change + uint64 Accessed : Last access + uint64 Created : Creation date + + object, dict GetFile(string targetfile, string sourcefile) + + Copy the source file (from remote device) to the + target file (on local filesystem). + + If an empty target file is given, a name will be + automatically calculated for the temporary file. + + The returned path represents the newly created transfer, + which should be used to find out if the content has been + successfully transferred or if the operation fails. + + The properties of this transfer are also returned along + with the object path, to avoid a call to GetProperties. + + object, dict PutFile(string sourcefile, string targetfile) + + Copy the source file (from local filesystem) to the + target file (on remote device). + + The returned path represents the newly created transfer, + which should be used to find out if the content has been + successfully transferred or if the operation fails. + + The properties of this transfer are also returned along + with the object path, to avoid a call to GetProperties. + + void CopyFile(string sourcefile, string targetfile) + + Copy a file within the remote device from source file + to target file. + + void MoveFile(string sourcefile, string targetfile) + + Move a file within the remote device from source file + to the target file. + + void Delete(string file) + + Deletes the specified file/folder. diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c index 839b662e1..08a50d4fd 100644 --- a/obexd/client/ftp.c +++ b/obexd/client/ftp.c @@ -42,7 +42,7 @@ "\xF9\xEC\x7B\xC4\x95\x3C\x11\xD2\x98\x4E\x52\x54\x00\xDC\x9E\x09" #define OBEX_FTP_UUID_LEN 16 -#define FTP_INTERFACE "org.bluez.obex.FileTransfer" +#define FTP_INTERFACE "org.bluez.obex.FileTransfer1" #define ERROR_INTERFACE "org.bluez.obex.Error" #define FTP_UUID "00001106-0000-1000-8000-00805f9b34fb" #define PCSUITE_UUID "00005005-0000-1000-8000-0002ee000001"