diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-27 13:14:00 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-28 16:36:28 +0100 |
| commit | fc5d7f76257bf51c693dfb888c1a3dd61d8d2318 (patch) | |
| tree | 8dede81cb8a758700339c3c2306fd152657d5bce /server/snd_worker.c | |
| parent | f32503258fa1f0a88de410005609770bd23cac97 (diff) | |
| download | spice-fc5d7f76257bf51c693dfb888c1a3dd61d8d2318.tar.gz spice-fc5d7f76257bf51c693dfb888c1a3dd61d8d2318.tar.xz spice-fc5d7f76257bf51c693dfb888c1a3dd61d8d2318.zip | |
server: use the new reds_stream_{read,write}
https://bugs.freedesktop.org/show_bug.cgi?id=34795
Diffstat (limited to 'server/snd_worker.c')
| -rw-r--r-- | server/snd_worker.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server/snd_worker.c b/server/snd_worker.c index fcfaf978..80a0f788 100644 --- a/server/snd_worker.c +++ b/server/snd_worker.c @@ -243,7 +243,8 @@ static int snd_send_data(SndChannel *channel) vec_size = spice_marshaller_fill_iovec(channel->send_data.marshaller, vec, MAX_SEND_VEC, channel->send_data.pos); - if ((n = channel->peer->cb_writev(channel->peer->ctx, vec, vec_size)) == -1) { + n = reds_stream_writev(channel->peer, vec, vec_size); + if (n == -1) { switch (errno) { case EAGAIN: channel->blocked = TRUE; @@ -389,7 +390,8 @@ static void snd_receive(void* data) ssize_t n; n = channel->recive_data.end - channel->recive_data.now; ASSERT(n); - if ((n = channel->peer->cb_read(channel->peer->ctx, channel->recive_data.now, n)) <= 0) { + n = reds_stream_read(channel->peer, channel->recive_data.now, n); + if (n <= 0) { if (n == 0) { snd_disconnect_channel(channel); return; |