summaryrefslogtreecommitdiffstats
path: root/client/red_client.h
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2011-07-21 12:11:36 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2011-07-22 10:24:30 +0200
commiteb6f554094129b6a198607b2e65dfefa0c26c05b (patch)
tree805918437f4388d32c9b1cd4d1c735de6e064a0d /client/red_client.h
parentfc2f7d14a27bf44866c6244c8c512fbfddbea677 (diff)
downloadspice-eb6f554094129b6a198607b2e65dfefa0c26c05b.tar.gz
spice-eb6f554094129b6a198607b2e65dfefa0c26c05b.tar.xz
spice-eb6f554094129b6a198607b2e65dfefa0c26c05b.zip
client: don't die if initial agent timeout triggers
When the client connects to a spice VM, if an agent is detected, there will be a few messages exchanged to exchange capabilities, display resolutions, ... This exchange has a timeout in case something goes wrong. However, when it fires, the client dies. This commit changes this and lets the client connects to the guest when the timeout happens. rhbz #673973
Diffstat (limited to 'client/red_client.h')
-rw-r--r--client/red_client.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/red_client.h b/client/red_client.h
index 7f5b5896..17391e49 100644
--- a/client/red_client.h
+++ b/client/red_client.h
@@ -114,8 +114,14 @@ public:
}
};
+class RedClient;
+
class AgentTimer: public Timer {
+public:
virtual void response(AbstractProcessLoop& events_loop);
+ AgentTimer(RedClient *client) : _client(client) {};
+private:
+ RedClient *_client;
};
typedef std::map< int, RedPeer::ConnectionOptions::Type> PeerConnectionOptMap;