2014-10-31 15:46:47

by Bharat Bhusan Panda

Subject: [PATCH ] obexd/ftp: Handle transfer reset for FTP

Changes made to emit transfer completed to .Transfer1 interface on
ftp reset.
---
obexd/plugins/ftp.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index 4c35467..e255f48 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -494,6 +494,13 @@ static void ftp_progress(struct obex_session *os, void *user_data)
manager_emit_transfer_progress(ftp->transfer);
}

+static void ftp_reset(struct obex_session *os, void *user_data)
+{
+ struct ftp_session *ftp = user_data;
+
+ manager_emit_transfer_completed(ftp->transfer);
+}
+
static struct obex_service_driver ftp = {
.name = "File Transfer server",
.service = OBEX_FTP,
@@ -506,7 +513,8 @@ static struct obex_service_driver ftp = {
.chkput = ftp_chkput,
.setpath = ftp_setpath,
.action = ftp_action,
- .disconnect = ftp_disconnect
+ .disconnect = ftp_disconnect,
+ .reset = ftp_reset
};

static int ftp_init(void)
--
1.9.1

2014-11-04 09:25:21

by Luiz Augusto von Dentz

Subject: Re: [PATCH ] obexd/ftp: Handle transfer reset for FTP

Hi,

On Fri, Oct 31, 2014 at 5:46 PM, Bharat Panda <[email protected]> wrote:
> Changes made to emit transfer completed to .Transfer1 interface on
> ftp reset.
> ---
> obexd/plugins/ftp.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
> index 4c35467..e255f48 100644
> --- a/obexd/plugins/ftp.c
> +++ b/obexd/plugins/ftp.c
> @@ -494,6 +494,13 @@ static void ftp_progress(struct obex_session *os, void *user_data)
> manager_emit_transfer_progress(ftp->transfer);
> }
>
> +static void ftp_reset(struct obex_session *os, void *user_data)
> +{
> + struct ftp_session *ftp = user_data;
> +
> + manager_emit_transfer_completed(ftp->transfer);
> +}
> +
> static struct obex_service_driver ftp = {
> .name = "File Transfer server",
> .service = OBEX_FTP,
> @@ -506,7 +513,8 @@ static struct obex_service_driver ftp = {
> .chkput = ftp_chkput,
> .setpath = ftp_setpath,
> .action = ftp_action,
> - .disconnect = ftp_disconnect
> + .disconnect = ftp_disconnect,
> + .reset = ftp_reset
> };
>
> static int ftp_init(void)
> --
> 1.9.1

Applied, thanks.


--
Luiz Augusto von Dentz