diff options
| -rw-r--r-- | server/inputs_channel.c | 5 | ||||
| -rw-r--r-- | server/main_channel.c | 5 | ||||
| -rw-r--r-- | server/red_channel.c | 12 | ||||
| -rw-r--r-- | server/red_channel.h | 4 | ||||
| -rw-r--r-- | server/red_tunnel_worker.c | 5 | ||||
| -rw-r--r-- | server/red_worker.c | 14 | ||||
| -rw-r--r-- | server/smartcard.c | 5 |
7 files changed, 41 insertions, 9 deletions
diff --git a/server/inputs_channel.c b/server/inputs_channel.c index b7ae55a4..9b6c7913 100644 --- a/server/inputs_channel.c +++ b/server/inputs_channel.c @@ -508,6 +508,10 @@ static int inputs_channel_config_socket(RedChannel *channel) return TRUE; } +static void inputs_channel_hold_pipe_item(PipeItem *item) +{ +} + static void inputs_link(Channel *channel, RedsStreamContext *peer, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps) @@ -523,6 +527,7 @@ static void inputs_link(Channel *channel, RedsStreamContext *peer, int migration ,inputs_channel_handle_parsed ,inputs_channel_alloc_msg_rcv_buf ,inputs_channel_release_msg_rcv_buf + ,inputs_channel_hold_pipe_item ,inputs_channel_send_item ,inputs_channel_release_pipe_item ,inputs_channel_on_incoming_error diff --git a/server/main_channel.c b/server/main_channel.c index f1fb4c68..1abf107a 100644 --- a/server/main_channel.c +++ b/server/main_channel.c @@ -776,6 +776,10 @@ static int main_channel_config_socket(RedChannel *channel) return TRUE; } +static void main_channel_hold_pipe_item(PipeItem *item) +{ +} + static void main_channel_link(Channel *channel, RedsStreamContext *peer, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps) @@ -791,6 +795,7 @@ static void main_channel_link(Channel *channel, RedsStreamContext *peer, int mig ,main_channel_handle_parsed ,main_channel_alloc_msg_rcv_buf ,main_channel_release_msg_rcv_buf + ,main_channel_hold_pipe_item ,main_channel_send_item ,main_channel_release_pipe_item ,main_channel_on_error diff --git a/server/red_channel.c b/server/red_channel.c index 584b92e4..afa3ff2f 100644 --- a/server/red_channel.c +++ b/server/red_channel.c @@ -224,6 +224,7 @@ static void red_channel_peer_prepare_out_msg(void *opaque, struct iovec *vec, in static void red_channel_peer_on_out_block(void *opaque) { RedChannel *channel = (RedChannel *)opaque; + channel->send_data.blocked = TRUE; channel->core->watch_update_mask(channel->peer->watch, SPICE_WATCH_EVENT_READ | @@ -253,6 +254,7 @@ RedChannel *red_channel_create(int size, RedsStreamContext *peer, channel_handle_message_proc handle_message, channel_alloc_msg_recv_buf_proc alloc_recv_buf, channel_release_msg_recv_buf_proc release_recv_buf, + channel_hold_pipe_item_proc hold_item, channel_send_pipe_item_proc send_item, channel_release_pipe_item_proc release_item) { @@ -267,6 +269,7 @@ RedChannel *red_channel_create(int size, RedsStreamContext *peer, channel->disconnect = disconnect; channel->send_item = send_item; channel->release_item = release_item; + channel->hold_item = hold_item; channel->peer = peer; channel->core = core; @@ -332,6 +335,7 @@ RedChannel *red_channel_create_parser(int size, RedsStreamContext *peer, channel_handle_parsed_proc handle_parsed, channel_alloc_msg_recv_buf_proc alloc_recv_buf, channel_release_msg_recv_buf_proc release_recv_buf, + channel_hold_pipe_item_proc hold_item, channel_send_pipe_item_proc send_item, channel_release_pipe_item_proc release_item, channel_on_incoming_error_proc incoming_error, @@ -339,7 +343,7 @@ RedChannel *red_channel_create_parser(int size, RedsStreamContext *peer, { RedChannel *channel = red_channel_create(size, peer, core, migrate, handle_acks, config_socket, do_nothing_disconnect, do_nothing_handle_message, - alloc_recv_buf, release_recv_buf, send_item, release_item); + alloc_recv_buf, release_recv_buf, hold_item, send_item, release_item); if (channel == NULL) { return NULL; @@ -439,7 +443,11 @@ void red_channel_reset_send_data(RedChannel *channel) void red_channel_init_send_data(RedChannel *channel, uint16_t msg_type, PipeItem *item) { channel->send_data.header->type = msg_type; - channel->send_data.item = item; + if (item) { + ASSERT(channel->send_data.item == NULL); + channel->send_data.item = item; + channel->hold_item(item); + } } static void red_channel_send(RedChannel *channel) diff --git a/server/red_channel.h b/server/red_channel.h index e8ebb053..a778ffbe 100644 --- a/server/red_channel.h +++ b/server/red_channel.h @@ -107,6 +107,7 @@ typedef void (*channel_release_msg_recv_buf_proc)(RedChannel *channel, typedef void (*channel_disconnect_proc)(RedChannel *channel); typedef int (*channel_configure_socket_proc)(RedChannel *channel); typedef void (*channel_send_pipe_item_proc)(RedChannel *channel, PipeItem *item); +typedef void (*channel_hold_pipe_item_proc)(PipeItem *item); typedef void (*channel_release_pipe_item_proc)(RedChannel *channel, PipeItem *item, int item_pushed); typedef void (*channel_on_incoming_error_proc)(RedChannel *channel); @@ -145,6 +146,7 @@ struct RedChannel { channel_disconnect_proc disconnect; channel_send_pipe_item_proc send_item; + channel_hold_pipe_item_proc hold_item; channel_release_pipe_item_proc release_item; int during_send; @@ -165,6 +167,7 @@ RedChannel *red_channel_create(int size, RedsStreamContext *peer, channel_handle_message_proc handle_message, channel_alloc_msg_recv_buf_proc alloc_recv_buf, channel_release_msg_recv_buf_proc release_recv_buf, + channel_hold_pipe_item_proc hold_item, channel_send_pipe_item_proc send_item, channel_release_pipe_item_proc release_item); @@ -178,6 +181,7 @@ RedChannel *red_channel_create_parser(int size, RedsStreamContext *peer, channel_handle_parsed_proc handle_parsed, channel_alloc_msg_recv_buf_proc alloc_recv_buf, channel_release_msg_recv_buf_proc release_recv_buf, + channel_hold_pipe_item_proc hold_item, channel_send_pipe_item_proc send_item, channel_release_pipe_item_proc release_item, channel_on_incoming_error_proc incoming_error, diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c index 6092a76f..2553943f 100644 --- a/server/red_tunnel_worker.c +++ b/server/red_tunnel_worker.c @@ -3420,6 +3420,10 @@ static void on_new_tunnel_channel(TunnelChannel *channel) } } +static void tunnel_channel_hold_pipe_item(PipeItem *item) +{ +} + static void handle_tunnel_channel_link(Channel *channel, RedsStreamContext *peer, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps) @@ -3438,6 +3442,7 @@ static void handle_tunnel_channel_link(Channel *channel, RedsStreamContext *peer tunnel_channel_handle_message, tunnel_channel_alloc_msg_rcv_buf, tunnel_channel_release_msg_rcv_buf, + tunnel_channel_hold_pipe_item, tunnel_channel_send_item, tunnel_channel_release_pipe_item); diff --git a/server/red_worker.c b/server/red_worker.c index f163a712..2acef409 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -347,7 +347,7 @@ typedef struct LocalCursor { typedef struct RedChannel RedChannel; typedef void (*disconnect_channel_proc)(RedChannel *channel); -typedef void (*hold_item_proc)(void *item); +typedef void (*hold_pipe_item_proc)(void *item); typedef void (*release_item_proc)(RedChannel *channel, void *item); typedef int (*handle_message_proc)(RedChannel *channel, size_t size, uint32_t type, void *message); @@ -385,7 +385,7 @@ struct RedChannel { } recive_data; disconnect_channel_proc disconnect; - hold_item_proc hold_item; + hold_pipe_item_proc hold_item; release_item_proc release_item; handle_message_proc handle_message; #ifdef RED_STATISTICS @@ -9310,7 +9310,7 @@ static RedChannel *__new_channel(RedWorker *worker, int size, uint32_t channel_i RedsStreamContext *peer, int migrate, event_listener_action_proc handler, disconnect_channel_proc disconnect, - hold_item_proc hold_item, + hold_pipe_item_proc hold_item, release_item_proc release_item, handle_message_proc handle_message) { @@ -9389,7 +9389,7 @@ static void handle_channel_events(EventListener *in_listener, uint32_t events) } } -static void display_channel_hold_item(void *item) +static void display_channel_hold_pipe_item(void *item) { ASSERT(item); switch (((PipeItem *)item)->type) { @@ -9444,7 +9444,7 @@ static void handle_new_display_channel(RedWorker *worker, RedsStreamContext *pee SPICE_CHANNEL_DISPLAY, peer, migrate, handle_channel_events, red_disconnect_display, - display_channel_hold_item, + display_channel_hold_pipe_item, display_channel_release_item, display_channel_handle_message))) { return; @@ -9544,7 +9544,7 @@ static void on_new_cursor_channel(RedWorker *worker) } } -static void cursor_channel_hold_item(void *item) +static void cursor_channel_hold_pipe_item(void *item) { ASSERT(item); ((CursorItem *)item)->refs++; @@ -9566,7 +9566,7 @@ static void red_connect_cursor(RedWorker *worker, RedsStreamContext *peer, int m SPICE_CHANNEL_CURSOR, peer, migrate, handle_channel_events, red_disconnect_cursor, - cursor_channel_hold_item, + cursor_channel_hold_pipe_item, cursor_channel_release_item, channel_handle_message))) { return; diff --git a/server/smartcard.c b/server/smartcard.c index 7c0a5aaf..93142cce 100644 --- a/server/smartcard.c +++ b/server/smartcard.c @@ -485,6 +485,10 @@ static int smartcard_channel_handle_message(RedChannel *channel, SpiceDataHeader return TRUE; } +static void smartcard_channel_hold_pipe_item(PipeItem *item) +{ +} + static void smartcard_link(Channel *channel, RedsStreamContext *peer, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, @@ -502,6 +506,7 @@ static void smartcard_link(Channel *channel, RedsStreamContext *peer, smartcard_channel_handle_message, smartcard_channel_alloc_msg_rcv_buf, smartcard_channel_release_msg_rcv_buf, + smartcard_channel_hold_pipe_item, smartcard_channel_send_item, smartcard_channel_release_pipe_item); if (!g_smartcard_channel) { |