[Spice-devel] [spice-gtk v4 16/24] file-xfer: do not send EOF to the agent

[Jonathon Jongsma]

On Thu, 2016-06-23 at 19:37 +0200, Victor Toso wrote:
> There is no need to send 0 bytes of data to the agent, we should just
> wait for VD_AGENT_FILE_XFER_STATUS message.
> ---
>  src/channel-main.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/channel-main.c b/src/channel-main.c
> index 0505687..ef34daa 100644
> --- a/src/channel-main.c
> +++ b/src/channel-main.c
> @@ -1948,12 +1948,12 @@ static void file_xfer_read_async_cb(GObject
> *source_object,
>          spice_channel_wakeup(SPICE_CHANNEL(channel), FALSE);
>          spice_file_transfer_task_completed(xfer_task, error);
>          return;
> +    } else if (count == 0) {
> +        /* on EOF just wait for VD_AGENT_FILE_XFER_STATUS from agent */
> +        return;
>      }
>  
>      file_xfer_queue_msg_to_agent(xfer_task, buffer, count);
> -    if (count == 0)
> -        /* on EOF just wait for VD_AGENT_FILE_XFER_STATUS from agent */
> -        return;
>  
>      task_id = spice_file_transfer_task_get_id(xfer_task);
>      xfer_op = g_hash_table_lookup(channel->priv->file_xfer_tasks,
> GUINT_TO_POINTER(task_id));


Acked-by: Jonathon Jongsma <jjongsma at redhat.com>