[Spice-devel] [PATCH spice] reds: look up the right matching channel during link ack

Marc-André Lureau marcandre.lureau at gmail.com
Fri Jun 7 07:10:14 PDT 2013


It's quite surprising that the server is not looking up the matching
channel when setting up the link. It went probably unnoticed becauses
channels of the same kind usually share the same capabilities, and it's
unlikely to remove channel 0. But I happen to hit that error because
channel 0 was removed (I was looking at making channel discovery more
dynamic, so channel could be added and removed during a session)
---
 server/reds.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/reds.c b/server/reds.c
index 58e23a5..dd3005d 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1455,7 +1455,8 @@ static int reds_send_link_ack(RedLinkInfo *link)
 
     ack.error = SPICE_LINK_ERR_OK;
 
-    channel = reds_find_channel(link->link_mess->channel_type, 0);
+    channel = reds_find_channel(link->link_mess->channel_type,
+                                link->link_mess->channel_id);
     if (!channel) {
         spice_assert(link->link_mess->channel_type == SPICE_CHANNEL_MAIN);
         spice_assert(reds->main_channel);
-- 
1.8.3.rc1.49.g8d97506



More information about the Spice-devel mailing list