pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-08 12:24:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server/red_channel (all): add red_channel_get_stream

Browse Source 
use in config_socket, this makes the stream internal to the RedChannel
implementation that will change later for multiple client support.
This commit is contained in:
Alon Levy 2010-11-10 09:28:39 +02:00
parent 6b86259646
commit a05628bf06
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/inputs_channel.c
View File

@ -491,15 +491,16 @@ static int inputs_channel_config_socket(RedChannel *channel)
{
int flags;
int delay_val = 1;
RedsStream *stream = red_channel_get_stream(channel);
if (setsockopt(channel->stream->socket, IPPROTO_TCP, TCP_NODELAY,
if (setsockopt(stream->socket, IPPROTO_TCP, TCP_NODELAY,
&delay_val, sizeof(delay_val)) == -1) {
red_printf("setsockopt failed, %s", strerror(errno));
return FALSE;
}
if ((flags = fcntl(channel->stream->socket, F_GETFL)) == -1 ||
fcntl(channel->stream->socket, F_SETFL, flags | O_ASYNC) == -1) {
if ((flags = fcntl(stream->socket, F_GETFL)) == -1 ||
fcntl(stream->socket, F_SETFL, flags | O_ASYNC) == -1) {
red_printf("fcntl failed, %s", strerror(errno));
return FALSE;
}

6
server/red_channel.c
View File

@ -706,7 +706,13 @@ void red_channel_ack_set_client_window(RedChannel *channel, int client_window)
channel->ack_data.client_window = client_window;
}
/* accessors for RedChannel */
SpiceMarshaller *red_channel_get_marshaller(RedChannel *channel)
{
return channel->send_data.marshaller;
}
RedsStream *red_channel_get_stream(RedChannel *channel)
{
return channel->stream;
}

4
server/red_channel.h
View File

@ -272,6 +272,10 @@ void red_channel_pipe_clear(RedChannel *channel);
// handle_channel_events - this is the only one that was used before, and was in red_channel.c
void red_channel_receive(RedChannel *channel);
void red_channel_send(RedChannel *channel);
/* accessors for RedChannel */
/* Note: the valid times to call red_channel_get_marshaller are just during send_item callback. */
SpiceMarshaller *red_channel_get_marshaller(RedChannel *channel);
RedsStream *red_channel_get_stream(RedChannel *channel);
#endif

7
server/red_tunnel_worker.c
View File

@ -3335,20 +3335,21 @@ static int tunnel_channel_config_socket(RedChannel *channel)
{
int flags;
int delay_val;
RedsStream *stream = red_channel_get_stream(channel);
if ((flags = fcntl(channel->stream->socket, F_GETFL)) == -1) {
if ((flags = fcntl(stream->socket, F_GETFL)) == -1) {
red_printf("accept failed, %s", strerror(errno)); // can't we just use red_error?
return FALSE;
}
if (fcntl(channel->stream->socket, F_SETFL, flags | O_NONBLOCK) == -1) {
if (fcntl(stream->socket, F_SETFL, flags | O_NONBLOCK) == -1) {
red_printf("accept failed, %s", strerror(errno));
return FALSE;
}
delay_val = 1;
if (setsockopt(channel->stream->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val,
if (setsockopt(stream->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val,
sizeof(delay_val)) == -1) {
red_printf("setsockopt failed, %s", strerror(errno));
}

2
server/red_worker.c
View File

@ -9026,7 +9026,7 @@ int common_channel_config_socket(RedChannel *channel)
{
int flags;
int delay_val;
RedsStream *stream = channel->stream;
RedsStream *stream = red_channel_get_stream(channel);
if ((flags = fcntl(stream->socket, F_GETFL)) == -1) {
red_printf("accept failed, %s", strerror(errno));