diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-09 21:44:45 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-28 16:36:35 +0100 |
| commit | 76dc27f08a15bd2cb0e0f536972e361e6d7acc25 (patch) | |
| tree | d44181ebb3408f1573b9e782e2f23d5704d1518a /server/red_tunnel_worker.c | |
| parent | 1a4923c2107c89314714718ca1431d232cc23edf (diff) | |
| download | spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.tar.gz spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.tar.xz spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.zip | |
server: rename s/peer/stream
This is stylish change again. We are talking about a RedStream object,
so let's just name the variable "stream" everywhere, to avoid
confusion with a non existent RedPeer object.
https://bugs.freedesktop.org/show_bug.cgi?id=34795
Diffstat (limited to 'server/red_tunnel_worker.c')
| -rw-r--r-- | server/red_tunnel_worker.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c index 6ea58f05..fddcf2c0 100644 --- a/server/red_tunnel_worker.c +++ b/server/red_tunnel_worker.c @@ -598,7 +598,7 @@ static void arm_timer(SlirpUsrNetworkInterface *usr_interface, UserTimer *timer, /* reds interface */ -static void handle_tunnel_channel_link(Channel *channel, RedsStream *peer, int migration, +static void handle_tunnel_channel_link(Channel *channel, RedsStream *stream, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps); static void handle_tunnel_channel_shutdown(struct Channel *channel); @@ -3347,19 +3347,19 @@ static int tunnel_channel_config_socket(RedChannel *channel) int flags; int delay_val; - if ((flags = fcntl(channel->peer->socket, F_GETFL)) == -1) { + if ((flags = fcntl(channel->stream->socket, F_GETFL)) == -1) { red_printf("accept failed, %s", strerror(errno)); // can't we just use red_error? return FALSE; } - if (fcntl(channel->peer->socket, F_SETFL, flags | O_NONBLOCK) == -1) { + if (fcntl(channel->stream->socket, F_SETFL, flags | O_NONBLOCK) == -1) { red_printf("accept failed, %s", strerror(errno)); return FALSE; } delay_val = 1; - if (setsockopt(channel->peer->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val, + if (setsockopt(channel->stream->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val, sizeof(delay_val)) == -1) { red_printf("setsockopt failed, %s", strerror(errno)); } @@ -3424,7 +3424,7 @@ static void tunnel_channel_hold_pipe_item(PipeItem *item) { } -static void handle_tunnel_channel_link(Channel *channel, RedsStream *peer, int migration, +static void handle_tunnel_channel_link(Channel *channel, RedsStream *stream, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps) { @@ -3435,7 +3435,7 @@ static void handle_tunnel_channel_link(Channel *channel, RedsStream *peer, int m } tunnel_channel = - (TunnelChannel *)red_channel_create(sizeof(*tunnel_channel), peer, worker->core_interface, + (TunnelChannel *)red_channel_create(sizeof(*tunnel_channel), stream, worker->core_interface, migration, TRUE, tunnel_channel_config_socket, tunnel_channel_disconnect, |