2022-03-24 17:59:33

by xinpeng wang

[permalink] [raw]
Subject: [PATCH] obexd: Fix cann't receive small files sent by windows

Windows devices use streaming mode to send files. If a small file is
sent,the first time processing data will be completed successfully,
and the transfer_complete function will be called before the end to
clear os->path.At this time, the dbus signal is still pending, and
the dbus method call requesting the file path has not been processed;
in this way, the upper-level program will not be able to obtain the
file path, resulting in failure to receive the file.
Therefore, the signal of Filename is generated, and it is forced to
be sent when status=active.

Signed-off-by: xinpeng wang <[email protected]>
---
obexd/src/manager.c | 5 ++++-
obexd/src/obex.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 01741fe62..ba9ad43e6 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -533,8 +533,11 @@ void manager_emit_transfer_property(struct obex_transfer *transfer,
void manager_emit_transfer_started(struct obex_transfer *transfer)
{
transfer->status = TRANSFER_STATUS_ACTIVE;
+ if (!transfer->path)
+ return;

- manager_emit_transfer_property(transfer, "Status");
+ g_dbus_emit_property_changed_full(connection, transfer->path,
+ TRANSFER_INTERFACE, "Status",G_DBUS_PROPERTY_CHANGED_FLAG_FLUSH);
}

static void emit_transfer_completed(struct obex_transfer *transfer,
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 3a68fd66c..c0d9e160a 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -720,6 +720,7 @@ int obex_put_stream_start(struct obex_session *os, const char *filename)
manager_emit_transfer_property(os->service_data, "Size");

os->path = g_strdup(filename);
+ manager_emit_transfer_property(os->service_data, "Filename");

return 0;
}
--
2.20.1