pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 15:45:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: add reds_stream_{read,write,free,remove_watch}()

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=34795
This commit is contained in:
Marc-André Lureau 2011-02-27 09:46:14 +01:00 committed by Alon Levy
parent 881971fbca
commit eeb95c5b84
5 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/red_channel.c
View File

@ -293,7 +293,7 @@ RedChannel *red_channel_create(int size, RedsStream *peer,
error:
free(channel);
peer->cb_free(peer);
reds_stream_free(peer);
return NULL;
}

6
server/red_worker.c
View File

@ -8512,9 +8512,7 @@ static void red_disconnect_channel(RedChannel *channel)
{
channel_release_res(channel);
red_pipe_clear(channel);
channel->peer->cb_free(channel->peer);
reds_stream_free(channel->peer);
channel->peer = NULL;
channel->send_data.blocked = FALSE;
channel->send_data.size = channel->send_data.pos = 0;
@ -9371,7 +9369,7 @@ static RedChannel *__new_channel(RedWorker *worker, int size, uint32_t channel_i
error2:
free(channel);
error1:
peer->cb_free(peer);
reds_stream_free(peer);
return NULL;
}

62
server/reds.c
View File

@ -479,7 +479,7 @@ static int reds_ssl_writev(void *ctx, const struct iovec *vector, int count)
return return_code;
}
static int reds_ssl_free(RedsStream *peer)
static int reds_ssl_free(RedsStream* peer)
{
reds_channel_event(peer, SPICE_CHANNEL_EVENT_DISCONNECTED);
SSL_free(peer->ssl);
@ -488,6 +488,33 @@ static int reds_ssl_free(RedsStream *peer)
return 0;
}
static void reds_stream_remove_watch(RedsStream* s)
{
if (s->watch) {
core->watch_remove(s->watch);
s->watch = NULL;
}
}
static void reds_link_free(RedLinkInfo *link)
{
reds_stream_free(link->peer);
link->peer = NULL;
free(link->link_mess);
link->link_mess = NULL;
BN_free(link->tiTicketing.bn);
link->tiTicketing.bn = NULL;
if (link->tiTicketing.rsa) {
RSA_free(link->tiTicketing.rsa);
link->tiTicketing.rsa = NULL;
}
free(link);
}
static void __reds_release_link(RedLinkInfo *link)
{
ASSERT(link->peer);
@ -4223,3 +4250,36 @@ __visible__ int spice_server_migrate_switch(SpiceServer *s)
reds_mig_switch();
return 0;
}
ssize_t reds_stream_read(RedsStream *s, void *buf, size_t nbyte)
{
return s->read(s, buf, nbyte);
}
ssize_t reds_stream_write(RedsStream *s, const void *buf, size_t nbyte)
{
return s->write(s, buf, nbyte);
}
ssize_t reds_stream_writev(RedsStream *s, const struct iovec *iov, int iovcnt)
{
return s->writev(s, iov, iovcnt);
}
void reds_stream_free(RedsStream *s)
{
if (!s) {
return;
}
reds_channel_event(s, SPICE_CHANNEL_EVENT_DISCONNECTED);
if (s->ssl) {
SSL_free(s->ssl);
}
reds_stream_remove_watch(s);
close(s->socket);
free(s);
}

16
server/reds.h
View File

@ -24,7 +24,9 @@
#define __visible__ __attribute__ ((visibility ("default")))
typedef struct RedsStream {
typedef struct RedsStream RedsStream;
struct RedsStream {
void *ctx;
int socket;
@ -42,7 +44,12 @@ typedef struct RedsStream {
int (*cb_writev)(void *, const struct iovec *vector, int count);
int (*cb_free)(struct RedsStream *);
} RedsStream;
/* private */
ssize_t (*read)(RedsStream *s, void *buf, size_t nbyte);
ssize_t (*write)(RedsStream *s, const void *buf, size_t nbyte);
ssize_t (*writev)(RedsStream *s, const struct iovec *iov, int iovcnt);
};
typedef struct Channel {
struct Channel *next;
@ -81,6 +88,11 @@ struct SpiceNetWireState {
struct TunnelWorker *worker;
};
ssize_t reds_stream_read(RedsStream *s, void *buf, size_t nbyte);
ssize_t reds_stream_write(RedsStream *s, const void *buf, size_t nbyte);
ssize_t reds_stream_writev(RedsStream *s, const struct iovec *iov, int iovcnt);
void reds_stream_free(RedsStream *s);
void reds_desable_mm_timer();
void reds_enable_mm_timer();
void reds_update_mm_timer(uint32_t mm_time);

4
server/snd_worker.c
View File

@ -188,7 +188,7 @@ static void snd_disconnect_channel(SndChannel *channel)
worker->connection = NULL;
core->watch_remove(channel->peer->watch);
channel->peer->watch = NULL;
channel->peer->cb_free(channel->peer);
reds_stream_free(channel->peer);
spice_marshaller_destroy(channel->send_data.marshaller);
free(channel);
}
@ -800,7 +800,7 @@ error2:
free(channel);
error1:
peer->cb_free(peer);
reds_stream_free(peer);
return NULL;
}