From: Christophe Fergeau <cferg...@redhat.com> VDIPortState and VDIReadBuf don't really need to be defined in a header file as they are only used in reds.c --- server/reds-private.h | 56 +---------------- server/reds.c | 167 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 113 insertions(+), 110 deletions(-)
diff --git a/server/reds-private.h b/server/reds-private.h index 3001990..8842aad 100644 --- a/server/reds-private.h +++ b/server/reds-private.h @@ -40,58 +40,6 @@ typedef struct MonitorMode { uint32_t y_res; } MonitorMode; -typedef struct VDIPortState VDIPortState; - -typedef struct VDIReadBuf { - VDIPortState *state; - RingItem link; - uint32_t refs; - - int len; - uint8_t data[SPICE_AGENT_MAX_DATA_SIZE]; -} VDIReadBuf; - -enum { - VDI_PORT_READ_STATE_READ_HEADER, - VDI_PORT_READ_STATE_GET_BUFF, - VDI_PORT_READ_STATE_READ_DATA, -}; - -struct VDIPortState { - SpiceCharDeviceState *base; - uint32_t plug_generation; - int client_agent_started; - - /* write to agent */ - SpiceCharDeviceWriteBuffer *recv_from_client_buf; - int recv_from_client_buf_pushed; - AgentMsgFilter write_filter; - - /* read from agent */ - Ring read_bufs; - uint32_t read_state; - uint32_t message_receive_len; - uint8_t *receive_pos; - uint32_t receive_len; - VDIReadBuf *current_read_buf; - AgentMsgFilter read_filter; - - VDIChunkHeader vdi_chunk_header; - - SpiceMigrateDataMain *mig_data; /* storing it when migration data arrives - before agent is attached */ -}; - -/* messages that are addressed to the agent and are created in the server */ -typedef struct __attribute__ ((__packed__)) VDInternalBuf { - VDIChunkHeader chunk_header; - VDAgentMessage header; - union { - VDAgentMouseState mouse_state; - } - u; -} VDInternalBuf; - #ifdef RED_STATISTICS #define REDS_MAX_STAT_NODES 100 @@ -140,12 +88,14 @@ typedef struct RedSSLParameters { char ciphersuite[256]; } RedSSLParameters; +typedef struct VDIPortState VDIPortState; + struct RedsState { int listen_socket; int secure_listen_socket; SpiceWatch *listen_watch; SpiceWatch *secure_listen_watch; - VDIPortState agent_state; + VDIPortState *agent_state; int pending_mouse_event; Ring clients; int num_clients; diff --git a/server/reds.c b/server/reds.c index 240bea6..b563f4e 100644 --- a/server/reds.c +++ b/server/reds.c @@ -166,6 +166,57 @@ struct ChannelSecurityOptions { ChannelSecurityOptions *next; }; +typedef struct VDIReadBuf { + VDIPortState *state; + RingItem link; + uint32_t refs; + + int len; + uint8_t data[SPICE_AGENT_MAX_DATA_SIZE]; +} VDIReadBuf; + +enum { + VDI_PORT_READ_STATE_READ_HEADER, + VDI_PORT_READ_STATE_GET_BUFF, + VDI_PORT_READ_STATE_READ_DATA, +}; + +struct VDIPortState { + SpiceCharDeviceState *base; + uint32_t plug_generation; + int client_agent_started; + + /* write to agent */ + SpiceCharDeviceWriteBuffer *recv_from_client_buf; + int recv_from_client_buf_pushed; + AgentMsgFilter write_filter; + + /* read from agent */ + Ring read_bufs; + uint32_t read_state; + uint32_t message_receive_len; + uint8_t *receive_pos; + uint32_t receive_len; + VDIReadBuf *current_read_buf; + AgentMsgFilter read_filter; + + VDIChunkHeader vdi_chunk_header; + + SpiceMigrateDataMain *mig_data; /* storing it when migration data arrives + before agent is attached */ +}; + +/* messages that are addressed to the agent and are created in the server */ +typedef struct __attribute__ ((__packed__)) VDInternalBuf { + VDIChunkHeader chunk_header; + VDAgentMessage header; + union { + VDAgentMouseState mouse_state; + } + u; +} VDInternalBuf; + + static void migrate_timeout(void *opaque); static RedsMigTargetClient* reds_mig_target_client_find(RedsState *reds, RedClient *client); static void reds_mig_target_client_free(RedsMigTargetClient *mig_client); @@ -396,7 +447,7 @@ static void reds_mig_cleanup(RedsState *reds) static void reds_reset_vdp(RedsState *reds) { - VDIPortState *state = &reds->agent_state; + VDIPortState *state = reds->agent_state; SpiceCharDeviceInterface *sif; state->read_state = VDI_PORT_READ_STATE_READ_HEADER; @@ -485,11 +536,11 @@ void reds_client_disconnect(RedsState *reds, RedClient *client) reds_mig_remove_wait_disconnect_client(reds, client); } - if (reds->agent_state.base) { + if (reds->agent_state->base) { /* note that vdagent might be NULL, if the vdagent was once * up and than was removed */ - if (spice_char_device_client_exists(reds->agent_state.base, client)) { - spice_char_device_client_remove(reds->agent_state.base, client); + if (spice_char_device_client_exists(reds->agent_state->base, client)) { + spice_char_device_client_remove(reds->agent_state->base, client); } } @@ -501,14 +552,14 @@ void reds_client_disconnect(RedsState *reds, RedClient *client) // if we are in the middle of one from another client) if (reds->num_clients == 0) { /* Let the agent know the client is disconnected */ - if (reds->agent_state.base) { + if (reds->agent_state->base) { SpiceCharDeviceWriteBuffer *char_dev_buf; VDInternalBuf *internal_buf; uint32_t total_msg_size; total_msg_size = sizeof(VDIChunkHeader) + sizeof(VDAgentMessage); char_dev_buf = spice_char_device_write_buffer_get_server_no_token( - reds->agent_state.base, total_msg_size); + reds->agent_state->base, total_msg_size); char_dev_buf->buf_used = total_msg_size; internal_buf = (VDInternalBuf *)char_dev_buf->buf; internal_buf->chunk_header.port = VDP_SERVER_PORT; @@ -518,21 +569,21 @@ void reds_client_disconnect(RedsState *reds, RedClient *client) internal_buf->header.opaque = 0; internal_buf->header.size = 0; - spice_char_device_write_buffer_add(reds->agent_state.base, + spice_char_device_write_buffer_add(reds->agent_state->base, char_dev_buf); } /* Reset write filter to start with clean state on client reconnect */ - agent_msg_filter_init(&reds->agent_state.write_filter, reds->agent_copypaste, + agent_msg_filter_init(&reds->agent_state->write_filter, reds->agent_copypaste, reds->agent_file_xfer, reds_use_client_monitors_config(reds), TRUE); /* Throw away pending chunks from the current (if any) and future * messages read from the agent */ - reds->agent_state.read_filter.result = AGENT_MSG_FILTER_DISCARD; - reds->agent_state.read_filter.discard_all = TRUE; - free(reds->agent_state.mig_data); - reds->agent_state.mig_data = NULL; + reds->agent_state->read_filter.result = AGENT_MSG_FILTER_DISCARD; + reds->agent_state->read_filter.discard_all = TRUE; + free(reds->agent_state->mig_data); + reds->agent_state->mig_data = NULL; reds_mig_cleanup(reds); } @@ -710,7 +761,7 @@ static SpiceCharDeviceMsgToClient *vdi_port_read_one_msg_from_device(SpiceCharDe void *opaque) { RedsState *reds = opaque; - VDIPortState *state = &reds->agent_state; + VDIPortState *state = reds->agent_state; SpiceCharDeviceInterface *sif; VDIReadBuf *dispatch_buf; int n; @@ -734,7 +785,7 @@ static SpiceCharDeviceMsgToClient *vdi_port_read_one_msg_from_device(SpiceCharDe state->message_receive_len = state->vdi_chunk_header.size; state->read_state = VDI_PORT_READ_STATE_GET_BUFF; case VDI_PORT_READ_STATE_GET_BUFF: { - if (!(state->current_read_buf = vdi_port_state_get_read_buf(&reds->agent_state))) { + if (!(state->current_read_buf = vdi_port_state_get_read_buf(reds->agent_state))) { return NULL; } state->receive_pos = state->current_read_buf->data; @@ -764,7 +815,7 @@ static SpiceCharDeviceMsgToClient *vdi_port_read_one_msg_from_device(SpiceCharDe } else { state->read_state = VDI_PORT_READ_STATE_GET_BUFF; } - if (vdi_port_read_buf_process(&reds->agent_state, dispatch_buf, &error)) { + if (vdi_port_read_buf_process(reds->agent_state, dispatch_buf, &error)) { return dispatch_buf; } else { if (error) { @@ -839,13 +890,13 @@ void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mou VDInternalBuf *internal_buf; uint32_t total_msg_size; - if (!reds->inputs_channel || !reds->agent_state.base) { + if (!reds->inputs_channel || !reds->agent_state->base) { return; } total_msg_size = sizeof(VDIChunkHeader) + sizeof(VDAgentMessage) + sizeof(VDAgentMouseState); - char_dev_buf = spice_char_device_write_buffer_get(reds->agent_state.base, + char_dev_buf = spice_char_device_write_buffer_get(reds->agent_state->base, NULL, total_msg_size); @@ -866,7 +917,7 @@ void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mou internal_buf->u.mouse_state = *mouse_state; char_dev_buf->buf_used = total_msg_size; - spice_char_device_write_buffer_add(reds->agent_state.base, char_dev_buf); + spice_char_device_write_buffer_add(reds->agent_state->base, char_dev_buf); } int reds_get_n_channels(RedsState *reds) @@ -923,7 +974,7 @@ void reds_fill_channels(RedsState *reds, SpiceMsgChannels *channels_info) void reds_on_main_agent_start(RedsState *reds, MainChannelClient *mcc, uint32_t num_tokens) { - SpiceCharDeviceState *dev_state = reds->agent_state.base; + SpiceCharDeviceState *dev_state = reds->agent_state->base; RedChannelClient *rcc; if (!reds->vdagent) { @@ -931,7 +982,7 @@ void reds_on_main_agent_start(RedsState *reds, MainChannelClient *mcc, uint32_t } spice_assert(reds->vdagent->st && reds->vdagent->st == dev_state); rcc = main_channel_client_get_base(mcc); - reds->agent_state.client_agent_started = TRUE; + reds->agent_state->client_agent_started = TRUE; /* * Note that in older releases, send_tokens were set to ~0 on both client * and server. The server ignored the client given tokens. @@ -961,10 +1012,10 @@ void reds_on_main_agent_start(RedsState *reds, MainChannelClient *mcc, uint32_t num_tokens); } - agent_msg_filter_config(&reds->agent_state.write_filter, reds->agent_copypaste, + agent_msg_filter_config(&reds->agent_state->write_filter, reds->agent_copypaste, reds->agent_file_xfer, reds_use_client_monitors_config(reds)); - reds->agent_state.write_filter.discard_all = FALSE; + reds->agent_state->write_filter.discard_all = FALSE; } void reds_on_main_agent_tokens(RedsState *reds, MainChannelClient *mcc, uint32_t num_tokens) @@ -980,7 +1031,7 @@ void reds_on_main_agent_tokens(RedsState *reds, MainChannelClient *mcc, uint32_t uint8_t *reds_get_agent_data_buffer(RedsState *reds, MainChannelClient *mcc, size_t size) { - VDIPortState *dev_state = &reds->agent_state; + VDIPortState *dev_state = reds->agent_state; RedClient *client; if (!dev_state->client_agent_started) { @@ -1005,7 +1056,7 @@ uint8_t *reds_get_agent_data_buffer(RedsState *reds, MainChannelClient *mcc, siz void reds_release_agent_data_buffer(RedsState *reds, uint8_t *buf) { - VDIPortState *dev_state = &reds->agent_state; + VDIPortState *dev_state = reds->agent_state; if (!dev_state->recv_from_client_buf) { free(buf); @@ -1014,7 +1065,7 @@ void reds_release_agent_data_buffer(RedsState *reds, uint8_t *buf) spice_assert(buf == dev_state->recv_from_client_buf->buf + sizeof(VDIChunkHeader)); if (!dev_state->recv_from_client_buf_pushed) { - spice_char_device_write_buffer_release(reds->agent_state.base, + spice_char_device_write_buffer_release(reds->agent_state->base, dev_state->recv_from_client_buf); } dev_state->recv_from_client_buf = NULL; @@ -1058,11 +1109,11 @@ static void reds_on_main_agent_monitors_config(RedsState *reds, void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void *message, size_t size) { - VDIPortState *dev_state = &reds->agent_state; + VDIPortState *dev_state = reds->agent_state; VDIChunkHeader *header; int res; - res = agent_msg_filter_process_data(&reds->agent_state.write_filter, + res = agent_msg_filter_process_data(&reds->agent_state->write_filter, message, size); switch (res) { case AGENT_MSG_FILTER_OK: @@ -1077,8 +1128,8 @@ void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void *mess return; } - spice_assert(reds->agent_state.recv_from_client_buf); - spice_assert(message == reds->agent_state.recv_from_client_buf->buf + sizeof(VDIChunkHeader)); + spice_assert(reds->agent_state->recv_from_client_buf); + spice_assert(message == reds->agent_state->recv_from_client_buf->buf + sizeof(VDIChunkHeader)); // TODO - start tracking agent data per channel header = (VDIChunkHeader *)dev_state->recv_from_client_buf->buf; header->port = VDP_CLIENT_PORT; @@ -1086,7 +1137,7 @@ void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void *mess dev_state->recv_from_client_buf->buf_used = sizeof(VDIChunkHeader) + size; dev_state->recv_from_client_buf_pushed = TRUE; - spice_char_device_write_buffer_add(reds->agent_state.base, dev_state->recv_from_client_buf); + spice_char_device_write_buffer_add(reds->agent_state->base, dev_state->recv_from_client_buf); } void reds_on_main_migrate_connected(RedsState *reds, int seamless) @@ -1121,7 +1172,7 @@ void reds_on_main_mouse_mode_request(RedsState *reds, void *message, size_t size */ void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc) { - VDIPortState *agent_state = &reds->agent_state; + VDIPortState *agent_state = reds->agent_state; uint32_t read_data_len; spice_assert(reds->num_clients == 1); @@ -1142,7 +1193,7 @@ void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc) !agent_state->read_filter.msg_data_to_read); read_buf->len = read_data_len; - if (vdi_port_read_buf_process(&reds->agent_state, read_buf, &error)) { + if (vdi_port_read_buf_process(reds->agent_state, read_buf, &error)) { main_channel_client_push_agent_data(mcc, read_buf->data, read_buf->len, @@ -1166,7 +1217,7 @@ void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc) void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m) { SpiceMigrateDataMain mig_data; - VDIPortState *agent_state = &reds->agent_state; + VDIPortState *agent_state = reds->agent_state; SpiceMarshaller *m2; memset(&mig_data, 0, sizeof(mig_data)); @@ -1191,8 +1242,8 @@ void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m) return; } - spice_char_device_state_migrate_data_marshall(reds->agent_state.base, m); - spice_marshaller_add_uint8(m, reds->agent_state.client_agent_started); + spice_char_device_state_migrate_data_marshall(reds->agent_state->base, m); + spice_marshaller_add_uint8(m, reds->agent_state->client_agent_started); mig_data.agent2client.chunk_header = agent_state->vdi_chunk_header; @@ -1248,7 +1299,7 @@ void reds_marshall_migrate_data(RedsState *reds, SpiceMarshaller *m) static int reds_agent_state_restore(RedsState *reds, SpiceMigrateDataMain *mig_data) { - VDIPortState *agent_state = &reds->agent_state; + VDIPortState *agent_state = reds->agent_state; uint32_t chunk_header_remaining; agent_state->vdi_chunk_header = mig_data->agent2client.chunk_header; @@ -1270,7 +1321,7 @@ static int reds_agent_state_restore(RedsState *reds, SpiceMigrateDataMain *mig_d uint32_t cur_buf_size; agent_state->read_state = VDI_PORT_READ_STATE_READ_DATA; - agent_state->current_read_buf = vdi_port_state_get_read_buf(&reds->agent_state); + agent_state->current_read_buf = vdi_port_state_get_read_buf(reds->agent_state); spice_assert(agent_state->current_read_buf); partial_msg_header = (uint8_t *)mig_data + mig_data->agent2client.msg_header_ptr - sizeof(SpiceMiniDataHeader); @@ -1322,7 +1373,7 @@ static int reds_agent_state_restore(RedsState *reds, SpiceMigrateDataMain *mig_d int reds_handle_migrate_data(RedsState *reds, MainChannelClient *mcc, SpiceMigrateDataMain *mig_data, uint32_t size) { - VDIPortState *agent_state = &reds->agent_state; + VDIPortState *agent_state = reds->agent_state; spice_debug("main-channel: got migrate data"); /* @@ -1695,12 +1746,12 @@ static void reds_handle_main_link(RedsState *reds, RedLinkInfo *link) if (mig_target) { spice_warning("unexpected: vdagent attached to destination during migration"); } - agent_msg_filter_config(&reds->agent_state.read_filter, + agent_msg_filter_config(&reds->agent_state->read_filter, reds->agent_copypaste, reds->agent_file_xfer, reds_use_client_monitors_config(reds)); - reds->agent_state.read_filter.discard_all = FALSE; - reds->agent_state.plug_generation++; + reds->agent_state->read_filter.discard_all = FALSE; + reds->agent_state->plug_generation++; } if (!mig_target) { @@ -2971,7 +3022,7 @@ void reds_disable_mm_time(RedsState *reds) static SpiceCharDeviceState *attach_to_red_agent(RedsState *reds, SpiceCharDeviceInstance *sin) { - VDIPortState *state = &reds->agent_state; + VDIPortState *state = reds->agent_state; SpiceCharDeviceInterface *sif; SpiceCharDeviceCallbacks char_dev_state_cbs; @@ -3007,9 +3058,9 @@ static SpiceCharDeviceState *attach_to_red_agent(RedsState *reds, SpiceCharDevic } state->read_filter.discard_all = FALSE; - reds->agent_state.plug_generation++; + reds->agent_state->plug_generation++; - if (reds->agent_state.mig_data || + if (reds->agent_state->mig_data || red_channel_is_waiting_for_migrate_data(&reds->main_channel->base)) { /* Migration in progress (code is running on the destination host): * 1. Add the client to spice char device, if it was not already added. @@ -3018,10 +3069,10 @@ static SpiceCharDeviceState *attach_to_red_agent(RedsState *reds, SpiceCharDevic * 2.b If this happens second ==> we already have spice migrate data * then restore state */ - if (!spice_char_device_client_exists(reds->agent_state.base, reds_get_client(reds))) { + if (!spice_char_device_client_exists(reds->agent_state->base, reds_get_client(reds))) { int client_added; - client_added = spice_char_device_client_add(reds->agent_state.base, + client_added = spice_char_device_client_add(reds->agent_state->base, reds_get_client(reds), TRUE, /* flow control */ REDS_VDI_PORT_NUM_RECEIVE_BUFFS, @@ -3035,12 +3086,12 @@ static SpiceCharDeviceState *attach_to_red_agent(RedsState *reds, SpiceCharDevic } } - if (reds->agent_state.mig_data) { + if (reds->agent_state->mig_data) { spice_debug("restoring state from stored migration data"); - spice_assert(reds->agent_state.plug_generation == 1); - reds_agent_state_restore(reds, reds->agent_state.mig_data); - free(reds->agent_state.mig_data); - reds->agent_state.mig_data = NULL; + spice_assert(reds->agent_state->plug_generation == 1); + reds_agent_state_restore(reds, reds->agent_state->mig_data); + free(reds->agent_state->mig_data); + reds->agent_state->mig_data = NULL; } else { spice_debug("waiting for migration data"); @@ -3310,9 +3361,11 @@ SPICE_GNUC_VISIBLE int spice_server_remove_interface(SpiceBaseInstance *sin) static void reds_init_vd_agent_resources(RedsState *reds) { - VDIPortState *state = &reds->agent_state; + VDIPortState *state; int i; + reds->agent_state = g_new0(VDIPortState, 1); + state = reds->agent_state; ring_init(&state->read_bufs); agent_msg_filter_init(&state->write_filter, reds->agent_copypaste, reds->agent_file_xfer, @@ -3329,7 +3382,7 @@ static void reds_init_vd_agent_resources(RedsState *reds) VDIReadBuf *buf = spice_new0(VDIReadBuf, 1); buf->state = state; ring_item_init(&buf->link); - ring_add(&reds->agent_state.read_bufs, &buf->link); + ring_add(&reds->agent_state->read_bufs, &buf->link); } } @@ -3823,16 +3876,16 @@ SPICE_GNUC_VISIBLE int spice_server_set_agent_mouse(SpiceServer *reds, int enabl SPICE_GNUC_VISIBLE int spice_server_set_agent_copypaste(SpiceServer *reds, int enable) { reds->agent_copypaste = enable; - reds->agent_state.write_filter.copy_paste_enabled = reds->agent_copypaste; - reds->agent_state.read_filter.copy_paste_enabled = reds->agent_copypaste; + reds->agent_state->write_filter.copy_paste_enabled = reds->agent_copypaste; + reds->agent_state->read_filter.copy_paste_enabled = reds->agent_copypaste; return 0; } SPICE_GNUC_VISIBLE int spice_server_set_agent_file_xfer(SpiceServer *reds, int enable) { reds->agent_file_xfer = enable; - reds->agent_state.write_filter.file_xfer_enabled = reds->agent_file_xfer; - reds->agent_state.read_filter.file_xfer_enabled = reds->agent_file_xfer; + reds->agent_state->write_filter.file_xfer_enabled = reds->agent_file_xfer; + reds->agent_state->read_filter.file_xfer_enabled = reds->agent_file_xfer; return 0; } -- 2.5.5 _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel