[Spice-devel] [vdagent-linux v4 1/7] vdagentd: send file-xfer status, generic version

[Victor Toso]

Hi,

On Tue, May 03, 2016 at 11:37:43AM -0500, Jonathon Jongsma wrote:
> On Tue, 2016-05-03 at 13:01 +0200, Victor Toso wrote:
> > Change cancel_file_xfer() helper function to file_xfer_status() so we
> > can send other status to the client.
>
> I like the idea, though I'd prefer a verb in the function name to make it
> obvious that we're *sending* the status to the client. Something as simple as
> send_file_xfer_status() perhaps.
>
> Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

Suggestion taken. Thank you very much for the reviews!
All patches pushed.

Cheers,
  toso

>
> > ---
> >  src/vdagentd.c | 16 +++++++++-------
> >  1 file changed, 9 insertions(+), 7 deletions(-)
> > 
> > diff --git a/src/vdagentd.c b/src/vdagentd.c
> > index 69332ff..263c288 100644
> > --- a/src/vdagentd.c
> > +++ b/src/vdagentd.c
> > @@ -249,12 +249,14 @@ static void do_client_clipboard(struct
> > vdagent_virtio_port *vport,
> >                  data, size);
> >  }
> >  
> > -static void cancel_file_xfer(struct vdagent_virtio_port *vport,
> > -                             const char *msg, uint32_t id)
> > +/* To be used by vdagentd for failures in file-xfer such as when file-xfer
> > was
> > + * cancelled or an error happened */
> > +static void file_xfer_status(struct vdagent_virtio_port *vport,
> > +                             const char *msg, uint32_t id, uint32_t
> > xfer_status)
> >  {
> >      VDAgentFileXferStatusMessage status = {
> >          .id = id,
> > -        .result = VD_AGENT_FILE_XFER_STATUS_CANCELLED,
> > +        .result = xfer_status,
> >      };
> >      syslog(LOG_WARNING, msg, id);
> >      if (vport)
> > @@ -274,10 +276,10 @@ static void do_client_file_xfer(struct
> > vdagent_virtio_port *vport,
> >      case VD_AGENT_FILE_XFER_START: {
> >          VDAgentFileXferStartMessage *s = (VDAgentFileXferStartMessage *)data;
> >          if (!active_session_conn) {
> > -            cancel_file_xfer(vport,
> > +            file_xfer_status(vport,
> >                 "Could not find an agent connnection belonging to the "
> >                 "active session, cancelling client file-xfer request %u",
> > -               s->id);
> > +               s->id, VD_AGENT_FILE_XFER_STATUS_CANCELLED);
> >              return;
> >          }
> >          udscs_write(active_session_conn, VDAGENTD_FILE_XFER_START, 0, 0,
> > @@ -648,8 +650,8 @@ static void update_active_session_connection(struct
> > udscs_connection *new_conn)
> >  static gboolean remove_active_xfers(gpointer key, gpointer value, gpointer
> > conn)
> >  {
> >      if (value == conn) {
> > -        cancel_file_xfer(virtio_port, "Agent disc; cancelling file-xfer %u",
> > -                         GPOINTER_TO_UINT(key));
> > +        file_xfer_status(virtio_port, "Agent disc; cancelling file-xfer %u",
> > +                         GPOINTER_TO_UINT(key),
> > VD_AGENT_FILE_XFER_STATUS_CANCELLED);
> >          return 1;
> >      } else
> >          return 0;
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel