diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2011-08-03 18:36:04 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-08-23 18:27:46 +0300 |
| commit | f84dfeb0aac4b6b49bc447a2140cbc7c2882de51 (patch) | |
| tree | 67797cd53349553b101bf1f9c5ea4057b123bacb /server/main_channel.h | |
| parent | 1db936e64cfe955a757d9d77302f104f68a58bfd (diff) | |
| download | spice-f84dfeb0aac4b6b49bc447a2140cbc7c2882de51.tar.gz spice-f84dfeb0aac4b6b49bc447a2140cbc7c2882de51.tar.xz spice-f84dfeb0aac4b6b49bc447a2140cbc7c2882de51.zip | |
server: registering RedChannel in reds, instead of Channel
Merging the functionality of reds::channel, into RedChannel.
In addition, cleanup and fix disconnection code: before this patch,
red_dispatcher_disconnect_display_client
could have been called from the red_worker thread
(and it must be called only from the io thread).
RedChannel holds only connected channel clients. RedClient holds all the
channel clients that were created till it is destroyed
(and then it destroys them as well).
Note: snd_channel still doesn't use red_channel, however it
creates dummy channel and channel clients, in order to register itself
in reds.
server/red_channel.c: a channel is connected if it holds at least one channel client
Previously I changed RedChannel to hold only connected channel clients and
RedClient, to hold all the channel clients as long as it is not destroyed.
usbredir: multichannel has not been tested, it just compiles.
Diffstat (limited to 'server/main_channel.h')
| -rw-r--r-- | server/main_channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/main_channel.h b/server/main_channel.h index 0dd37973..80475354 100644 --- a/server/main_channel.h +++ b/server/main_channel.h @@ -47,10 +47,10 @@ struct MainMigrateData { typedef struct MainChannel MainChannel; -Channel *main_channel_init(void); +MainChannel *main_channel_init(void); RedClient *main_channel_get_client_by_link_id(MainChannel *main_chan, uint32_t link_id); /* This is a 'clone' from the reds.h Channel.link callback to allow passing link_id */ -MainChannelClient *main_channel_link(struct Channel *, RedClient *client, +MainChannelClient *main_channel_link(MainChannel *, RedClient *client, RedsStream *stream, uint32_t link_id, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps); void main_channel_close(MainChannel *main_chan); // not destroy, just socket close |