[Spice-devel] [PATCH spice v4 2/2] server: Filter VD_AGENT_MONITORS_CONFIG

[Hans de Goede]

Hi,

On 09/12/2012 08:09 PM, Alon Levy wrote:
> If the guest supports client monitors config we pass it the
> VDAgentMonitorsConfig message via the
> QXLInterface::client_monitors_config api instead of via the vdagent.
> ---
>   server/agent-msg-filter.c |  8 +++++++
>   server/agent-msg-filter.h |  1 +
>   server/reds.c             | 55 +++++++++++++++++++++++++++++++++++++++++++++--
>   3 files changed, 62 insertions(+), 2 deletions(-)
>
> diff --git a/server/agent-msg-filter.c b/server/agent-msg-filter.c
> index 7584b52..b48dd76 100644
> --- a/server/agent-msg-filter.c
> +++ b/server/agent-msg-filter.c
> @@ -24,6 +24,7 @@
>   #include <string.h>
>   #include "red_common.h"
>   #include "agent-msg-filter.h"
> +#include "red_dispatcher.h"
>
>   void agent_msg_filter_init(struct AgentMsgFilter *filter,
>       int copy_paste, int discard_all)
> @@ -80,6 +81,13 @@ data_to_read:
>                   filter->result = AGENT_MSG_FILTER_DISCARD;
>               }
>               break;
> +        case VD_AGENT_MONITORS_CONFIG:
> +            if (red_dispatcher_use_client_monitors_config()) {
> +                filter->result = AGENT_MSG_FILTER_MONITORS_CONFIG;
> +            } else {
> +                filter->result = AGENT_MSG_FILTER_OK;
> +            }
> +            break;
>           default:
>               filter->result = AGENT_MSG_FILTER_OK;
>           }
> diff --git a/server/agent-msg-filter.h b/server/agent-msg-filter.h
> index ecccfc7..0132ad7 100644
> --- a/server/agent-msg-filter.h
> +++ b/server/agent-msg-filter.h
> @@ -28,6 +28,7 @@ enum {
>       AGENT_MSG_FILTER_OK,
>       AGENT_MSG_FILTER_DISCARD,
>       AGENT_MSG_FILTER_PROTO_ERROR,
> +    AGENT_MSG_FILTER_MONITORS_CONFIG,
>       AGENT_MSG_FILTER_END
>   };
>
> diff --git a/server/reds.c b/server/reds.c
> index 57ce88b..1240049 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -234,6 +234,15 @@ typedef struct SpiceCharDeviceStateItem {
>       SpiceCharDeviceState *st;
>   } SpiceCharDeviceStateItem;
>
> +/* Intermediate state for on going monitors config message from a single
> + * client, being passed to the guest */
> +typedef struct RedsClientMonitorsConfig {
> +    MainChannelClient *mcc;
> +    uint8_t *buffer;
> +    int buffer_size;
> +    int buffer_pos;
> +} RedsClientMonitorsConfig;
> +
>   typedef struct RedsState {
>       int listen_socket;
>       int secure_listen_socket;
> @@ -284,6 +293,8 @@ typedef struct RedsState {
>   #endif
>       int peer_minor_version;
>       int allow_multiple_clients;
> +
> +    RedsClientMonitorsConfig client_monitors_config;
>   } RedsState;
>
>   static RedsState *reds = NULL;
> @@ -1184,6 +1195,41 @@ void reds_release_agent_data_buffer(uint8_t *buf)
>       dev_state->recv_from_client_buf_pushed = FALSE;
>   }
>
> +static void reds_client_monitors_config_cleanup(void)
> +{
> +    RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
> +
> +    cmc->buffer_size = cmc->buffer_pos = 0;
> +    free(cmc->buffer);
> +    cmc->buffer = NULL;
> +    cmc->mcc = NULL;
> +}
> +
> +static void reds_on_main_agent_monitors_config(
> +        MainChannelClient *mcc, void *message, size_t size)
> +{
> +    VDAgentMessage *msg_header;
> +    VDAgentMonitorsConfig *monitors_config;
> +    RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
> +
> +    cmc->buffer_size += size;
> +    cmc->buffer = realloc(cmc->buffer, cmc->buffer_size);
> +    spice_assert(cmc->buffer);
> +    cmc->mcc = mcc;
> +    memcpy(cmc->buffer + cmc->buffer_pos, message, size);
> +    cmc->buffer_pos += size;
> +    msg_header = (VDAgentMessage *)cmc->buffer;
> +    if (sizeof(VDAgentMessage) > cmc->buffer_size ||
> +            msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) {
> +        spice_debug("not enough data yet. %d\n", cmc->buffer_size);
> +        return;
> +    }
> +    monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header));
> +    spice_debug("%s: %d\n", __func__, monitors_config->num_of_monitors);
> +    red_dispatcher_client_monitors_config(monitors_config);
> +    reds_client_monitors_config_cleanup();
> +}
> +
>   void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size)
>   {
>       VDIPortState *dev_state = &reds->agent_state;
> @@ -1199,16 +1245,18 @@ void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size)
>           break;
>       case AGENT_MSG_FILTER_DISCARD:
>           return;
> +    case AGENT_MSG_FILTER_MONITORS_CONFIG:
> +        reds_on_main_agent_monitors_config(mcc, message, size);
> +        return;
>       case AGENT_MSG_FILTER_PROTO_ERROR:
>           reds_disconnect();
>           return;
>       }
> -
>       // TODO - start tracking agent data per channel
>       header =  (VDIChunkHeader *)dev_state->recv_from_client_buf->buf;
>       header->port = VDP_CLIENT_PORT;
>       header->size = size;
> -    dev_state->recv_from_client_buf->buf_used = sizeof(VDIChunkHeader) + size;
> +    reds->agent_state.recv_from_client_buf->buf_used = sizeof(VDIChunkHeader) + size;


This seems to be a re-do of the previous patch ? I wonder if / how the series applies at all ?

ACK series with this fixed.

Regards,

Hans