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

server: use the new reds_stream_{read,write}

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=34795
This commit is contained in:
Marc-André Lureau 2011-02-27 13:14:00 +01:00
parent f32503258f
commit fc5d7f7625
5 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/red_channel.c
View File

@ -41,7 +41,8 @@ static int red_peer_receive(RedsStream *peer, uint8_t *buf, uint32_t size)
if (peer->shutdown) {
return -1;
}
if ((now = peer->cb_read(peer->ctx, pos, size)) <= 0) {
now = reds_stream_read(peer, pos, size);
if (now <= 0) {
if (now == 0) {
return -1;
}
@ -154,7 +155,8 @@ void red_channel_receive(RedChannel *channel)
static void red_peer_handle_outgoing(RedsStream *peer, OutgoingHandler *handler)
{
int n;
ssize_t n;
if (handler->size == 0) {
handler->vec = handler->vec_buf;
handler->size = handler->get_msg_size(handler->opaque);
@ -162,9 +164,11 @@ static void red_peer_handle_outgoing(RedsStream *peer, OutgoingHandler *handler)
return;
}
}
for (;;) {
handler->prepare(handler->opaque, handler->vec, &handler->vec_size, handler->pos);
if ((n = peer->cb_writev(peer->ctx, handler->vec, handler->vec_size)) == -1) {
n = reds_stream_writev(peer, handler->vec, handler->vec_size);
if (n == -1) {
switch (errno) {
case EAGAIN:
handler->on_block(handler->opaque);

10
server/red_worker.c
View File

@ -7339,9 +7339,9 @@ static void inline channel_release_res(RedChannel *channel)
static void red_send_data(RedChannel *channel)
{
for (;;) {
uint32_t n = channel->send_data.size - channel->send_data.pos;
ssize_t n = channel->send_data.size - channel->send_data.pos;
struct iovec vec[MAX_SEND_VEC];
int vec_size;
size_t vec_size;
if (!n) {
channel->send_data.blocked = FALSE;
@ -7354,7 +7354,8 @@ static void red_send_data(RedChannel *channel)
vec_size = spice_marshaller_fill_iovec(channel->send_data.marshaller,
vec, MAX_SEND_VEC, channel->send_data.pos);
ASSERT(channel->peer);
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->send_data.blocked = TRUE;
@ -9277,7 +9278,8 @@ static void red_receive(RedChannel *channel)
n = channel->recive_data.end - channel->recive_data.now;
ASSERT(n);
ASSERT(channel->peer);
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) {
channel->disconnect(channel);
return;

76
server/reds.c
View File

@ -304,73 +304,60 @@ static void reds_channel_event(RedsStream *peer, int event)
core->channel_event(event, &peer->info);
}
static int reds_write(void *ctx, void *buf, size_t size)
static ssize_t stream_write_cb(RedsStream *s, const void *buf, size_t size)
{
int return_code;
int sock = (long)ctx;
size_t count = size;
return_code = write(sock, buf, count);
return (return_code);
return write(s->socket, buf, size);
}
static int reds_read(void *ctx, void *buf, size_t size)
static ssize_t stream_writev_cb(RedsStream *s, const struct iovec *iov, int iovcnt)
{
int return_code;
int sock = (long)ctx;
size_t count = size;
return_code = read(sock, buf, count);
return (return_code);
return writev(s->socket, iov, iovcnt);
}
static int reds_ssl_write(void *ctx, void *buf, size_t size)
static ssize_t stream_read_cb(RedsStream *s, void *buf, size_t size)
{
return read(s->socket, buf, size);
}
static ssize_t stream_ssl_write_cb(RedsStream *s, const void *buf, size_t size)
{
int return_code;
int ssl_error;
SSL *ssl = ctx;
SPICE_GNUC_UNUSED int ssl_error;
return_code = SSL_write(ssl, buf, size);
return_code = SSL_write(s->ssl, buf, size);
if (return_code < 0) {
ssl_error = SSL_get_error(ssl, return_code);
(void)ssl_error;
ssl_error = SSL_get_error(s->ssl, return_code);
}
return (return_code);
return return_code;
}
static int reds_ssl_read(void *ctx, void *buf, size_t size)
static ssize_t stream_ssl_read_cb(RedsStream *s, void *buf, size_t size)
{
int return_code;
int ssl_error;
SSL *ssl = ctx;
SPICE_GNUC_UNUSED int ssl_error;
return_code = SSL_read(ssl, buf, size);
return_code = SSL_read(s->ssl, buf, size);
if (return_code < 0) {
ssl_error = SSL_get_error(ssl, return_code);
(void)ssl_error;
ssl_error = SSL_get_error(s->ssl, return_code);
}
return (return_code);
return return_code;
}
static int reds_ssl_writev(void *ctx, const struct iovec *vector, int count)
static ssize_t stream_ssl_writev_cb(RedsStream *s, const struct iovec *vector, int count)
{
int i;
int n;
int return_code = 0;
ssize_t return_code = 0;
int ssl_error;
SSL *ssl = ctx;
for (i = 0; i < count; ++i) {
n = SSL_write(ssl, vector[i].iov_base, vector[i].iov_len);
n = SSL_write(s->ssl, vector[i].iov_base, vector[i].iov_len);
if (n <= 0) {
ssl_error = SSL_get_error(ssl, n);
(void)ssl_error;
ssl_error = SSL_get_error(s->ssl, n);
if (return_code <= 0) {
return n;
} else {
@ -1362,7 +1349,7 @@ static int sync_write(RedsStream *peer, void *in_buf, size_t n)
{
uint8_t *buf = (uint8_t *)in_buf;
while (n) {
int now = peer->cb_write(peer->ctx, buf, n);
int now = reds_stream_write(peer, buf, n);
if (now <= 0) {
if (now == -1 && (errno == EINTR || errno == EAGAIN)) {
continue;
@ -1664,7 +1651,8 @@ static void async_read_handler(int fd, int event, void *data)
int n = obj->end - obj->now;
ASSERT(n > 0);
if ((n = obj->peer->cb_read(obj->peer->ctx, obj->now, n)) <= 0) {
n = reds_stream_read(obj->peer, obj->now, n);
if (n <= 0) {
if (n < 0) {
switch (errno) {
case EAGAIN:
@ -1890,9 +1878,9 @@ static RedLinkInfo *reds_accept_connection(int listen_socket)
}
peer = link->peer;
peer->ctx = (void *)((unsigned long)link->peer->socket);
peer->cb_read = (int (*)(void *, void *, int))reds_read;
peer->cb_write = (int (*)(void *, void *, int))reds_write;
peer->cb_writev = (int (*)(void *, const struct iovec *vector, int count))writev;
peer->read = stream_read_cb;
peer->write = stream_write_cb;
peer->writev = stream_writev_cb;
return link;
}
@ -1925,9 +1913,9 @@ static void reds_accept_ssl_connection(int fd, int event, void *data)
SSL_set_bio(link->peer->ssl, sbio, sbio);
link->peer->ctx = (void *)(link->peer->ssl);
link->peer->cb_write = (int (*)(void *, void *, int))reds_ssl_write;
link->peer->cb_read = (int (*)(void *, void *, int))reds_ssl_read;
link->peer->cb_writev = reds_ssl_writev;
link->peer->write = stream_ssl_write_cb;
link->peer->read = stream_ssl_read_cb;
link->peer->writev = stream_ssl_writev_cb;
return_code = SSL_accept(link->peer->ssl);
if (return_code == 1) {

5
server/reds.h
View File

@ -43,11 +43,6 @@ struct RedsStream {
SpiceChannelEventInfo info;
int (*cb_write)(void *, void *, int);
int (*cb_read)(void *, void *, int);
int (*cb_writev)(void *, const struct iovec *vector, int count);
/* private */
ssize_t (*read)(RedsStream *s, void *buf, size_t nbyte);
ssize_t (*write)(RedsStream *s, const void *buf, size_t nbyte);

6
server/snd_worker.c
View File

@ -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;