[Spice-devel] [PATCH spice v2] reds: Cancel unexpected xfer messages

[Pavel Grunt]

On Sun, 2017-06-04 at 12:20 +0300, Uri Lublin wrote:
> On 06/02/2017 06:31 PM, Frediano Ziglio wrote:
> > > 
> > > Inform client that transfer will not work, instead of only
> > > dropping the agent messages.
> > > 
> > > The file transfer messages can be disabled using qemu cli
> > > option:
> > >   "disable-agent-file-xfer"
> > > 
> > > Resolves:
> > > https://bugzilla.redhat.com/show_bug.cgi?id=1373725
> > > 
> > > Signed-off-by: Pavel Grunt <pgrunt at redhat.com>
> > > ---
> > >   server/reds.c | 34 ++++++++++++++++++++++++++++++++++
> > >   1 file changed, 34 insertions(+)
> > > 
> > > diff --git a/server/reds.c b/server/reds.c
> > > index bafd04bab..fd163250d 100644
> > > --- a/server/reds.c
> > > +++ b/server/reds.c
> > > @@ -1111,6 +1111,39 @@ static void
> > > reds_on_main_agent_monitors_config(RedsState *reds,
> > >       reds_client_monitors_config_cleanup(reds);
> > >   }
> > >   
> > > +static void agent_data_free(uint8_t *data, G_GNUC_UNUSED void
> > > *opaque)
> > > +{
> > > +    free(data);
> > > +}
> > > +
> > > +/*
> > > + * Inform client about discarded file transfer
> > > + * https://bugzilla.redhat.com/show_bug.cgi?id=1373725
> > > + */
> > > +static void agent_xfer_error(MainChannelClient *mcc, const
> > > VDAgentMessage
> > > *message)
> > > +{
> > > +    VDAgentMessage *xfer_msg;
> > > +    VDAgentFileXferStatusMessage *xfer_status;
> > > +    size_t len;
> > > +
> > > +    if (message->type < VD_AGENT_FILE_XFER_START || message-
> > > >type >
> > > VD_AGENT_FILE_XFER_DATA) {
> > > +        return;
> > > +    }
> > > +
> > > +    len = sizeof(VDAgentMessage) +
> > > sizeof(VDAgentFileXferStatusMessage);
> > > +    xfer_msg = spice_malloc0(len);
> > > +    xfer_msg->protocol = VD_AGENT_PROTOCOL;
> > > +    xfer_msg->type = VD_AGENT_FILE_XFER_STATUS;
> > > +    xfer_msg->size = sizeof(VDAgentFileXferStatusMessage);
> > > +    xfer_status = (VDAgentFileXferStatusMessage *) xfer_msg-
> > > >data;
> > > +    xfer_status->id = ((VDAgentFileXferStartMessage *) message-
> > > >data)->id;
> > 
> > VDAgentFileXferStartMessage should be const
> 
> Maybe also add a comment saying the first field of all
> file-xfer messages is (uint32_t) id, so it's safe to use
> VDAgentFileXferStartMessage.

sure!

Thanks,
Pavel

> 
> Uri.