pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-09 14:11:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reds: Replace RedsClientMonitorsConfig with SpiceBuffer

Browse Source 
RedsClientMonitorsConfig duplicates what SpiceBuffer does,
so using we can replace it with SpiceBuffer and make
reds_on_main_agent_monitors_config() simpler.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Christophe Fergeau 2017-05-30 16:37:35 +02:00
parent 1569d429b7
commit 2b08ba3d51
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/reds-private.h
View File

@ -59,14 +59,6 @@ typedef struct RedsMigTargetClient {
GList *pending_links;
} RedsMigTargetClient;
/* Intermediate state for on going monitors config message from a single
* client, being passed to the guest */
typedef struct RedsClientMonitorsConfig {
uint8_t *buffer;
int buffer_size;
int buffer_pos;
} RedsClientMonitorsConfig;
typedef struct ChannelSecurityOptions ChannelSecurityOptions;
typedef struct RedSSLParameters {
@ -126,7 +118,10 @@ struct RedsState {
#endif
int allow_multiple_clients;
RedsClientMonitorsConfig client_monitors_config;
/* Intermediate state for on going monitors config message from a single
* client, being passed to the guest */
SpiceBuffer client_monitors_config;
int mm_time_enabled;
uint32_t mm_time_latency;

27
server/reds.c
View File

@ -1102,37 +1102,24 @@ void reds_release_agent_data_buffer(RedsState *reds, uint8_t *buf)
dev->priv->recv_from_client_buf_pushed = FALSE;
}
static void reds_client_monitors_config_cleanup(RedsState *reds)
{
RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
cmc->buffer_size = cmc->buffer_pos = 0;
free(cmc->buffer);
cmc->buffer = NULL;
}
static void reds_on_main_agent_monitors_config(RedsState *reds,
MainChannelClient *mcc, const void *message, size_t size)
{
VDAgentMessage *msg_header;
VDAgentMonitorsConfig *monitors_config;
RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
SpiceBuffer *cmc = &reds->client_monitors_config;
cmc->buffer_size += size;
cmc->buffer = realloc(cmc->buffer, cmc->buffer_size);
spice_assert(cmc->buffer);
memcpy(cmc->buffer + cmc->buffer_pos, message, size);
cmc->buffer_pos += size;
spice_buffer_append(cmc, message, 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", cmc->buffer_size);
if (sizeof(VDAgentMessage) > cmc->offset ||
msg_header->size > cmc->offset - sizeof(VDAgentMessage)) {
spice_debug("not enough data yet. %zd", cmc->offset);
return;
}
monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header));
spice_debug("%s: %d", __func__, monitors_config->num_of_monitors);
reds_client_monitors_config(reds, monitors_config);
reds_client_monitors_config_cleanup(reds);
spice_buffer_free(cmc);
}
void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, const void *message,
@ -3438,7 +3425,7 @@ static int do_spice_init(RedsState *reds, SpiceCoreInterface *core_interface)
reds->mouse_mode = SPICE_MOUSE_MODE_SERVER;
reds_client_monitors_config_cleanup(reds);
spice_buffer_free(&reds->client_monitors_config);
reds->allow_multiple_clients = getenv(SPICE_DEBUG_ALLOW_MC_ENV) != NULL;
if (reds->allow_multiple_clients) {